Merge branch 'sohnoun' into dev_alexis

Conflicts:
	Ecom-war/web/cocktailDetails.xhtml
	Ecom-war/web/resources/component/ThumbnailComponent.xhtml
	Ecom-war/web/template/common/commonHeader.xhtml
Merge branch 'master' into dev_alexis

Conflicts:
	Ecom-war/web/template/common/commonHeader.xhtml
commit to pull
Merge branch 'dev_yann' into shi
Merge branch 'dev_yann' into shi
Merge branch 'dev_yann' into dev_alexis

Conflicts:
	Ecom-war/web/template/common/commonHeader.xhtml
Merge branch 'dev_yann' into dev_alexis

Conflicts:
	Ecom-war/web/template/common/commonHeader.xhtml
Added some (better ?) images. Define cascading on relationships. But not working yet...
Mise en place de l'ajout de plusieurs cocktails , tested OK , reste des bug pour le panier du coup
Change many things, to add some comments and group functions.
Use edit instead of persist, and so, change the equals function to do not duplicate entity.
Add some Cascading process, but need to change the one between client and address.
Add some normalized pictures.
Remove Cascading that doesn't work as expected...
Overide remove procedure for deliverables, but doesn't work...
Mise en place de la commande de plusieurs cocktails ok
Correction de l'ajout plusieures fois du meme cocktail
Correction du composant cart et modification de la mise en forme , a terminer
Add some functions for the heavy client
Merge branch 'dev_yann' into dev_alexis

Conflicts:
	Ecom-ejb/src/java/session/facade/ClientFacadeBean.java
	Ecom-ejb/src/java/session/interfaces/ClientFacadeRemoteItf.java
commit to pull
...
Comme d'hab...
Création d'entities Order et Address après la validation du panier 'sans CASCADING'