Mon commit
Merge branch 'master' of https://github.com/OlivierRevial/labo-devmobile-cocktails

Conflicts:
	gen/com/ingesup/devmobile/labo/cocktails/R.java