Quelques Modifs
Quelques Modifs
Quelques Modifs
Merge origin/master

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

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

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

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