Master

Hotline master

See merge request !691

Conflicts:
	VERSIONS
	library/startup.php

Hotline #21243 fix default properties overwrite in widget

See merge request !689

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