message
Merge branch 'master' of github.com:alroad/projet-javacance

Conflicts:
	target/classes/messages_fr.properties
	target/classes/org/jacademie/projet/controller/AlbumController.class
	target/classes/org/jacademie/projet/controller/ChansonController.class
	target/m2e-wtp/web-resources/META-INF/maven/org.jacademie/projet-javacance/pom.properties