Merge origin/master

Conflicts:
	Synthese/Synthese-war/src/java/controleur/srvlCommande.java
Merge origin/master
Merge origin/master

Conflicts:
	Synthese/Synthese-war/src/java/controleur/srvlCommande.java