commit to pull
merge
Merge branch 'master' of http://github.com/yanngit/EcomClient
Merge branch 'master' of http://github.com/yanngit/EcomClient

Conflicts:
	src/ecomclientlourdadmin/EcomClientLourdAdmin.java
add nouveau cocktail