Merge origin/Gael into Gael

Conflicts:
	src/java/servlet/Controleur.java