Merge origin/Gael into Gael

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

Merge origin/Gael into Gael