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

Conflicts:
	src/main/java/org/jacademie/projet/services/impl/ArtistServiceImpl.java
	src/main/webapp/WEB-INF/pages/artiste.jsp
	target/m2e-wtp/web-resources/META-INF/maven/org.jacademie/projet-javacance/pom.properties