Merge branch 'sandbox_fusion_search_result_and_print' into dev#17782_bonus_1_imprimer_la_liste_des_notices

Merge branch 'sandbox_fusion_search_result_and_print' into dev#17782_bonus_1_imprimer_la_liste_des_notices

Conflicts:
	application/modules/opac/controllers/CmsController.php
	application/modules/opac/controllers/RechercheController.php
	application/modules/opac/views/scripts/cms/articleviewbydate.phtml
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_260.php
	library/Class/ModeleFusion.php
	library/Class/Notice.php
	library/Class/WebService/SIGB/Opsys/Reservation.php
	library/ZendAfi/Controller/Action.php
	library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php
	tests/application/modules/admin/controllers/FormationControllerTest.php
	tests/application/modules/opac/controllers/RechercheControllerTest.php
	tests/library/ZendAfi/View/Helper/Admin/MenuGaucheAdminTest.php

Merge branch 'stable' into origin-hotline-master

Conflicts:
	VERSIONS
	library/startup.php

Hotline #29082 fix articles indexation into domains stable

See merge request !1057

Hotline#29043 cosmo encoding

See merge request !1053

Hotline #28241 flash messenger accessibility

See merge request !1047

Hotline #26993 records nanook serials

See merge request !1051

Conflicts:
	library/storm

Hotline#26961 localization plan

See merge request !1049

Hotline #26137 remove html tags in forms answers

See merge request !1048

Merge branch 'origin-stable' into origin-hotline-master

Conflicts:
	VERSIONS
	library/startup.php

Hotline master

See merge request !1045

Merge branch 'stable' into hotline-master

# Conflicts:
#	VERSIONS
#	library/startup.php

Hotline#27951 deleting numilog album should delete its record

See merge request !1035

Hotline#28245 fix random displaying of critics

See merge request !1036

Hotline#28796 fix thesaurus integration

See merge request !1043