jsp
jsp
Merge origin/master

Conflicts:
	Synthese/Synthese-ejb/src/java/session/ArticleFacade.java
	Synthese/Synthese-war/src/java/controleur/srvlCommande.java
	Synthese/Synthese-war/src/java/controleur/srvlNet_Articles.java