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...

amber/src/.gitignore

+# Ignoring compiled files in examples etc
+examples/nodejs/**/*.js
+examples/webos/**/*.js
+server/FileServer*.js
+
+# Ignoring Mac Finder files
+.DS_Store
+
+# Ignoring compiled files in st
+st/*.js
+
+# In case amber is also saved in a local Subversion
+.svn

amber/src/examples/android/helloamber/.gitignore

+*.js
+!assets/jquery-1.7.2.min.js
+bin/
+gen/

amber/src/examples/googlecharts/.gitignore

+# Ignore emacs backup files
+*~
\ No newline at end of file

amber/src/js/lib/es5-shim-2.0.2/.gitignore

+node_modules
+.DS_Store

cosmogramme/.gitignore

+config.php
+ftp
+charge*.txt
+report
+fichiers/cache
+fichiers/log
+fichiers/transferts
+*~
\ No newline at end of file

cosmogramme/php/classes/classe_notice_integration.php

@@ -1312,6 +1312,7 @@ class notice_integration
 	}
 }
 
+<<<<<<< HEAD
 
 
 class Pseudo_Notice {

public/admin/js/Monocle/.gitignore

+.rvmrc
+.screenrc
+/dist

public/admin/js/osmplayer/src/iscroll/.gitignore

+.DS_Store
+dist/*.js
+node_modules
\ No newline at end of file

public/opac/TimelineJS-2.25/.gitignore

+*.DS_Store
+.DS_Store*
+dev_examples/
+cdn/
+Embed.CDN.js
+Embed.CDN.Generator.js
+compiled/generator.html
+compiled/index.html
+compiled/generator-backup.html
+compiled/js/storyjs-embed-cdn.js
+compiled/js/storyjs-embed-generator.js
+compiled/css/timeline-generator.css
+*.tmproj
+*.tmproject
+tmtags
+source/gfx/Sprites/
\ No newline at end of file

public/opac/js/mugifly-jquery-simple-datetimepicker/.gitignore

+.project

public/opac/mobile/jQuery-Mobile-Icon-Pack/.gitignore

+*~
+.livereload
+.DS_Store

scripts/emacs/magit-1.2.0/.gitignore

+/INSTALL
+/Makefile.in
+/aclocal.m4
+/build-stamp
+/config.log
+/config.status
+/configure
+/debian/debhelper.log
+/debian/files
+/debian/magit.debhelper.log
+/debian/magit.postinst.debhelper
+/debian/magit.prerm.debhelper
+/install-sh
+/install-stamp
+/magit-*.tar.gz
+/magit.info
+/missing
+/texinfo.tex
+/debian/magit/
+/autom4te.cache/
+*.elc
+*~
+/magit.aux
+/magit.cp
+/magit.dvi
+/magit.fn
+/magit.ky
+/magit.log
+/magit.pg
+/magit.toc
+/magit.tp
+/magit.vr
+/magit.pdf
+/magit.ps
+/magit-pkg.el
+magit.spec
+50magit.el
+/dir

scripts/emacs/web-mode-master/.gitignore

+*~
+\#*\#
+*.elc
\ No newline at end of file

xhprof/.gitignore

+extension/*
+!extension/config.m4
+!extension/php_xhprof.h
+!extension/tests/
+!extension/xhprof.c