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