Merge origin/Eddy into Gael

Conflicts:
	src/java/servlet/Controleur.java
Merge pull request #97 from garzgul/Gael

Push Mercredi matin week 2