Merge origin/Eddy into gael

Conflicts:
	src/java/servlet/Controleur.java
Merge origin/Eddy into gael

Conflicts:
	src/java/servlet/Controleur.java