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