Merge origin/Emmanuelle into Gael

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

Merge origin/Emmanuelle into Gael