Merge origin/Emmanuelle into Emmanuelle

Conflicts:
	src/java/servlet/Controleur.java
Merge pull request #79 from garzgul/emmanuelle

Merge origin/Emmanuelle into Emmanuelle