Final bugging version
Merge branch 'develop' of
https://github.com/bmael/ReallySweetSadistic.git into develop

Conflicts:
	services/src/main/java/fr/nantes/univ/alma/reallysweetsadistic/services/impl/Authentifier.java
	services/src/main/webapp/WEB-INF/rest-context.xml