Merge
Merge branch 'master' of https://github.com/haxakl/tp2webmiage

Conflicts:
	src/java/servlets/visiteur/Accueil.java
	web/view/frontoffice/musiques.jsp