Merge origin/Emmanuelle into Gael

Conflicts:
	src/java/servlet/Controleur.java
Push Mardi Soir
avancement sur l'affichage commande
Merge pull request #90 from garzgul/Gael

merge mardi soir