Resolve conflicts

Conflicts:
	.gitattributes
	.gitignore
	application/modules/admin/controllers/AlbumController.php
	application/modules/admin/controllers/HarvestController.php
	application/modules/admin/controllers/SystemeController.php
	cosmogramme/php/classes/classe_notice_avenio.php
	cosmogramme/php/classes/classe_notice_integration.php
	cosmogramme/php/classes/classe_unimarc.php
	cosmogramme/tests/php/classes/NoticeIntegrationTest.php
	library/Class/Album.php
	library/Class/FRBR/Link.php
	library/Class/Indexation.php
	library/Class/NatureDoc.php
	library/Class/Notice.php
	library/Class/Profil.php
	library/Class/WebService/BibNumerique/RessourceNumerique.php
	library/ZendAfi/Controller/Plugin/AdminAuth.php
	scripts/emacs/phafi-autoload.el
	tests/application/modules/admin/controllers/AdminAuthControllerTest.php
	tests/application/modules/admin/controllers/AlbumControllerTest.php
	tests/application/modules/admin/controllers/HarvestControllerTest.php
	tests/application/modules/opac/controllers/IndexContro...