Conflicts:
src/documentations/eliot-import-annuaire/pom.xml
src/documentations/guide-exploitation/pom.xml
src/documentations/guide-exploitation/src/main/resources/docbook/bookinfo.xml
src/documentations/pom.xml
src/pom.xml
src/services-commons/eliot-commons/eliot-aaf-import/pom.xml
src/services-commons/eliot-commons/eliot-annuaire-commons/pom.xml
src/services-commons/eliot-commons/eliot-annuaire-interface/pom.xml
src/services-commons/eliot-commons/eliot-app-plugin/EliotAppPluginGrailsPlugin.groovy
src/services-commons/eliot-commons/eliot-app-plugin/application.properties
src/services-commons/eliot-commons/eliot-app-plugin/pom.xml
src/services-commons/eliot-commons/eliot-ascii2mathml/pom.xml
src/services-commons/eliot-commons/eliot-connecteur-aaf/pom.xml
src/services-commons/eliot-commons/eliot-connecteur-ldif/pom.xml
src/services-commons/eliot-commons/eliot-connecteur-udt/pom.xml
src/services-commons/eliot-commons/eliot-demon-commons/pom.xml
src/services-commons/eliot-commons/eliot-docs-commons/pom.xml
src/services-commons/eliot-commons/eliot-docs-dbmigration-all/pom.xml
src/services-commons/eliot-commons/eliot-docs-dbmigration/pom.xml
src/services-commons/eliot-commons/eliot-docs-securite-commons/pom.xml
src/services-commons/eliot-commons/eliot-interoperabilite/pom.xml
src/services-commons/eliot-commons/eliot-jcr-maintenance-commons/pom.xml
src/services-commons/eliot-commons/eliot-ldap2aaf/pom.xml
src/services-commons/eliot-commons/eliot-scolarite-dbmigration-all/pom.xml
src/services-commons/eliot-commons/eliot-scolarite-dbmigration/pom.xml
src/services-commons/eliot-commons/eliot-securite-commons/pom.xml
src/services-commons/eliot-commons/eliot-securite-dbmigration/pom.xml
src/services-commons/eliot-commons/eliot-webservices/pom.xml
src/services-commons/eliot-commons/pom.xml
src/services-commons/pom.xml
src/services/pom.xml
src/services/services-eliot/eliot-absences/application.properties
src/services/services-eliot/eliot-absences/pom.xml
src/services/services-eliot/eliot-agenda/application.properties
src/services/services-eliot/eliot-agenda/pom.xml
src/services/services-eliot/eliot-demon-docs/application.properties
src/services/services-eliot/eliot-demon-docs/pom.xml
src/services/services-eliot/eliot-demon-emploi-du-temps/application.properties
src/services/services-eliot/eliot-demon-emploi-du-temps/pom.xml
src/services/services-eliot/eliot-demon-scolarite/application.properties
src/services/services-eliot/eliot-demon-scolarite/pom.xml
src/services/services-eliot/eliot-docs/application.properties
src/services/services-eliot/eliot-docs/pom.xml
src/services/services-eliot/eliot-messagerie/application.properties
src/services/services-eliot/eliot-messagerie/pom.xml
src/services/services-eliot/eliot-notes-applet/pom.xml
src/services/services-eliot/eliot-notes-applet/test/integration/applet_fichiers_test/ADMISSION_POST_BAC_175.xml
src/services/services-eliot/eliot-notes/application.properties
src/services/services-eliot/eliot-notes/pom.xml
src/services/services-eliot/eliot-notes/web-app/applet/testNotanet.html
src/services/services-eliot/eliot-scolarite/application.properties
src/services/services-eliot/eliot-scolarite/pom.xml
src/services/services-eliot/eliot-textes/application.properties
src/services/services-eliot/eliot-textes/pom.xml
src/services/services-eliot/pom.xml