Merge origin/master

Conflicts:
	ECOM/ECOM-ejb/src/java/session/AdresseManager.java
	ECOM/ECOM-ejb/src/java/session/CategorieManager.java
	ECOM/ECOM-ejb/src/java/session/CommandeManager.java
	ECOM/ECOM-ejb/src/java/session/CouponManager.java
	ECOM/ECOM-ejb/src/java/session/EntrepriseManager.java
	ECOM/ECOM-ejb/src/java/session/LivraisonManager.java
	ECOM/ECOM-ejb/src/java/session/OffreManager.java
	ECOM/ECOM-ejb/src/java/session/UtilisateurManager.java