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
mise en page ingrédient
Ecran cocktail
Ecran cocktail
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
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/MainActivity.class
	bin/classes/com/ingesup/devmobile/labo/cocktails/MainActivityNicolas.class
	bin/classes/com/ingesup/devmobile/labo/cocktails/MainActivityPierreAntoine.class
	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/dexedLibs/android-support-v4-d0fe9ad90359f438a9dd87aed893c193.jar
	bin/res/crunch/drawable-hdpi/cocktail_default.png
	bin/resources.ap_
	gen/com/ingesup/devmobile/labo/cocktails/R.java
	res/layout/activity_main_elisa.xml
	res/layout/cellule_ingredient.xml
	res/values/strings.xml