Merge origin/Gael into Gael

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

merge mercredi soir week 2