Merge origin/master

Conflicts:
	src/java/servlet/Controleur.java
Merge origin/Emmanuelle into Gael
merge Mardi PM Gael
merge Mardi PM Gael