Merge origin/Eddy into gael

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

Conflicts:
	src/java/servlet/Controleur.java
Merge pull request #103 from garzgul/gael

merge mercredi soir week 2