Merge origin/Emmanuelle into Gael

Conflicts:
	src/java/servlet/Controleur.java