Merge remote-tracking branch 'refs/remotes/origin/master' into...

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#69826_contractuel_minsoc_diffusion_selective_de_l_information_enregistrer_modifier_ma_recherche

Conflicts:
	application/modules/admin/views/scripts/album/edit-images.phtml
	cosmogramme/sql/patch/patch_342.php
	library/ZendAfi/Controller/Plugin/Manager/Sitotheque.php
	library/ZendAfi/View/Helper/TagPreview.php
	library/ZendAfi/View/Helper/TagSlideshow.php
	tests/application/modules/admin/controllers/AdminControllerTest.php
	tests/application/modules/admin/controllers/CatalogueControllerTest.php
	tests/application/modules/admin/controllers/CmsControllerTest.php
	tests/application/modules/admin/controllers/IndexControllerTest.php
	tests/application/modules/admin/controllers/ProfilControllerIndexTest.php
	tests/application/modules/opac/controllers/PanierControllerTest.php
	tests/db/UpgradeDBTest.php
	tests/library/ZendAfi/View/Helper/Accueil/BibNumeriqueTest.php