commit to pull
commit to pull
commit to pull
commit to pull
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
centrage de bouton Paypal
Merge branch 'dev_yann' into dev_bach
Merge branch 'dev_yann' into dev_bach

merge avec dev_yann
Corrections OK
Correction LAZY probleme
merge avec sohnoun, amelioration du menu déroulant
commit to pull
VRAI commit to pull
Utilisation de PrimeFace pour le formulaire
Mise en place d'un nouvel attribut pour cocktail (statePublication) pour savoir si un cocktail est une proposition ou un cocktail affiché. Mise en place d'un ProposalMananger
Modification for the heavy client
Merge branch 'master' of https://github.com/yanngit/Ecom
Merge branch 'sohnoun' into dev_yann