toto2
Modification des ingrédients
Merge branch 'master' of https://github.com/OlivierRevial/labo-devmobile-cocktails

Conflicts:
	bin/LaboCocktails.apk
	bin/classes.dex
	bin/classes/com/ingesup/devmobile/labo/cocktails/R$drawable.class
	bin/classes/com/ingesup/devmobile/labo/cocktails/R$id.class
	bin/classes/com/ingesup/devmobile/labo/cocktails/R$layout.class
	bin/classes/com/ingesup/devmobile/labo/cocktails/R$menu.class
	bin/classes/com/ingesup/devmobile/labo/cocktails/R$string.class
	bin/classes/com/ingesup/devmobile/labo/cocktails/R$style.class
	bin/resources.ap_
	gen/com/ingesup/devmobile/labo/cocktails/R.java
	src/com/ingesup/devmobile/labo/cocktails/MainActivityPierreAntoine.java