Merge origin/master

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

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

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

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

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

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

Conflicts:
	Synthese/Synthese-ejb/src/java/dao/Article.java
	Synthese/Synthese-ejb/src/java/session/ArticleFacade.java
	Synthese/Synthese-war/src/java/controleur/srvlCommande.java
	Synthese/Synthese-war/src/java/controleur/srvlCompte.java
	Synthese/Synthese-war/web/rubriques.jsp
Merge origin/master

Conflicts:
	Synthese/Synthese-ejb/src/java/dao/Article.java
	Synthese/Synthese-ejb/src/java/session/ArticleFacade.java
	Synthese/Synthese-war/src/java/controleur/srvlCommande.java
	Synthese/Synthese-war/src/java/controleur/srvlCompte.java
	Synthese/Synthese-war/web/rubriques.jsp
Merge origin/master

Conflicts:
	Synthese/Synthese-ejb/src/java/dao/Article.java
	Synthese/Synthese-ejb/src/java/session/ArticleFacade.java
	Synthese/Synthese-war/src/java/controleur/srvlCommande.java
	Synthese/Synthese-war/src/java/controleur/srvlCompte.java
	Synthese/Synthese-war/web/rubriques.jsp
Merge origin/master

Conflicts:
	Synthese/Synthese-ejb/src/java/dao/Article.java
	Synthese/Synthese-ejb/src/java/session/ArticleFacade.java
	Synthese/Synthese-war/src/java/controleur/srvlCommande.java
	Synthese/Synthese-war/src/java/controleur/srvlCompte.java
	Synthese/Synthese-war/web/rubriques.jsp
Merge origin/master

Conflicts:
	Synthese/Synthese-ejb/src/java/dao/Article.java
	Synthese/Synthese-ejb/src/java/session/ArticleFacade.java
	Synthese/Synthese-war/src/java/controleur/srvlCommande.java
	Synthese/Synthese-war/src/java/controleur/srvlCompte.java
	Synthese/Synthese-war/web/rubriques.jsp
Merge origin/master

Conflicts:
	Synthese/Synthese-ejb/src/java/session/ClientFacade.java