modifs des entity
modifs des entity
Merge origin/master

Conflicts:
	artecom/artecom-ejb/src/java/model/entity/Craft.java
	artecom/artecom-ejb/src/java/model/entity/Product.java