Change cocktail adding function !
Merge branch 'master' of https://github.com/yanngit/EcomClient

Conflicts:
	src/views/cocktailsPanel.java