Merge origin/Emmanuelle into Emmanuelle

Conflicts:
	src/java/servlet/Controleur.java
Merge origin/Emmanuelle into gael

Conflicts:
	src/java/servlet/Controleur.java
	web/WEB-INF/main/Main.jsp