client
espace client
espace client
espace client
espace client
espace client
espace client
espace client
espace client
espace client
espace client
espace client
espace client
espace client
Merge origin/Cool into Cool

Conflicts:
	artecom/artecom-war/src/java/managedbean/ClientAddressManagedBean.java
	artecom/artecom-war/web/client/index.xhtml
	artecom/artecom-war/web/craftsman/gestprod.xhtml
espace client 2