edit craftsman
Merge origin/Cool into Cool
checkout
checkout
checkout
checkout
checkout
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-war/src/java/managedbean/ClientManagedBean.java
	artecom/artecom-war/src/java/managedbean/ProductManagedBean.java
	artecom/artecom-war/src/java/managedbean/SiteManagedBean.java
	artecom/artecom-war/web/compte.xhtml
	artecom/artecom-war/web/template/header.xhtml
indent + conflits git tu me casse les couilles