reglage craft.xhtml
mm
mm
mm
mm
mm
mm
mm
mm
mm
mm
mm
mm
mm
mm
Merge origin/master

Conflicts:
	artecom/artecom-ejb/src/java/model/entity/Craft.java
	artecom/artecom-ejb/src/java/model/entity/Craftsman.java
	artecom/artecom-war/web/address.xhtml
	artecom/artecom-war/web/craft.xhtml
	artecom/artecom-war/web/resources/css/common-style.css
Merge origin/master

Conflicts:
	artecom/artecom-ejb/src/java/model/entity/Craft.java
	artecom/artecom-ejb/src/java/model/entity/Craftsman.java
	artecom/artecom-war/web/address.xhtml
	artecom/artecom-war/web/craft.xhtml
	artecom/artecom-war/web/resources/css/common-style.css
Merge origin/master

Conflicts:
	artecom/artecom-war/web/resources/css/common-style.css