Conflicts solved:
	cosmogramme/php/_init.php
	library/Class/Codification.php
	library/ZendAfi/View/Helper/Frbr.php
	tests/application/modules/admin/controllers/CmsControllerTest.php
	tests/application/modules/opac/controllers/RechercheControllerAlbumAudioRecordTest.php
	tests/application/modules/opac/controllers/RechercheControllerTest.php

Conflictsi solved:
	application/modules/opac/controllers/RechercheController.php
	cosmogramme/php/_init.php
	library/Class/Notice.php
	library/Class/PanierNotice.php
	library/ZendAfi/Form/Album.php
	tests/application/modules/admin/controllers/CmsControllerTest.php
	tests/application/modules/opac/controllers/RechercheControllerTest.php

Hotline master

See merge request !687

Conflicts:
	VERSIONS
	library/startup.php

Conflicts:
	VERSIONS
	cosmogramme/sql/patch/patch_230.php
	library/startup.php

Hotline #20093 save 2 cols widget delete insite widget settings

See merge request !679

Hotline #18075 fix  private profil and rewrite url

See merge request !671

Hotline #20607 orphee integration issues

See merge request !673

Hotline #16604 fix default value in stats notices table

See merge request !674

Hotline#20588 suggestions

See merge request !682

Hotline#20851 facebook article

See merge request !677

Hotline#18745 collection index

See merge request !669

Hotline#18531 profil duplication

See merge request !668

Hotline#18372 sitotheque tri

See merge request !667

Hotline#18368 url rewriting bib view map

See merge request !666

fix display regression

change Class_Notice::getCollection to getCollectionS in order to not map database table column 'collection'. Fix collection index

Empty rewrite_url field when deep copying a profil

Display error message when deep copying a profil does not work

regression fix