Ajout des fichiers sqLite en phase de test
modification  progressBar
Merge branch 'master' of github.com:EdouardF/kiveukoi into matthieu

Conflicts:
	bin/Kiveukoi.apk
	bin/classes.dex
	bin/classes/com/kiveukoi/AjoutModif.class
	bin/classes/com/kiveukoi/Identification$1.class
	bin/classes/com/kiveukoi/Identification.class
	bin/classes/com/kiveukoi/MainActivity$1.class
	bin/classes/com/kiveukoi/MainActivity$2.class
	bin/classes/com/kiveukoi/MainActivity$3.class
	bin/classes/com/kiveukoi/MainActivity$4.class
	bin/classes/com/kiveukoi/MainActivity.class
	bin/classes/com/kiveukoi/Profil$1.class
	bin/classes/com/kiveukoi/Profil$2.class
	bin/classes/com/kiveukoi/Profil.class
	bin/classes/com/kiveukoi/R$id.class
	bin/classes/com/kiveukoi/R$layout.class
	bin/classes/com/kiveukoi/R$menu.class
	bin/classes/com/kiveukoi/R$string.class
	bin/classes/com/kiveukoi/R$style.class
	bin/classes/com/kiveukoi/User.class
	bin/resources.ap_
	gen/com/kiveukoi/R.java
	src/com/kiveukoi/MainActivity.java
	src/com/kiveukoi/User.java
Modification progress bar
Merge branch 'matthieu' of github.com:EdouardF/kiveukoi into matthieu

Conflicts:
	bin/classes.dex
	bin/classes/com/kiveukoi/Accueil.class
	bin/classes/com/kiveukoi/Identification$1.class
	bin/classes/com/kiveukoi/Identification$UserLoginTask.class
	bin/classes/com/kiveukoi/Identification.class
	bin/classes/com/kiveukoi/MainActivity.class
	bin/classes/com/kiveukoi/R$drawable.class
	bin/classes/com/kiveukoi/R$id.class
	bin/classes/com/kiveukoi/R$layout.class
	bin/classes/com/kiveukoi/R$menu.class
	bin/classes/com/kiveukoi/R$string.class
	bin/classes/com/kiveukoi/R$style.class
	bin/classes/com/kiveukoi/User.class
	bin/dexedLibs/android-support-v4-ff0f4b55cd8294c8975d263531ceb2d8.jar
	bin/kiveukoi.apk
	bin/resources.ap_
	gen/com/kiveukoi/R.java
	src/com/kiveukoi/MainActivity.java
	src/com/kiveukoi/User.java
Modif progress bar, j'adore ça

ps: y'a même pas de nuage!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
fail
Merge branch 'matthieu' of github.com:EdouardF/kiveukoi into Ronan

Conflicts:
	bin/Kiveukoi.apk
	bin/classes.dex
	bin/classes/com/kiveukoi/AjoutModif$2.class
	bin/classes/com/kiveukoi/AjoutModif$3.class
	bin/classes/com/kiveukoi/AjoutModif.class
	bin/classes/com/kiveukoi/Connexion.class
	bin/classes/com/kiveukoi/Identification$1.class
	bin/classes/com/kiveukoi/Identification$UserLoginTask.class
	bin/classes/com/kiveukoi/Identification.class
	bin/classes/com/kiveukoi/MainActivity$3.class
	bin/classes/com/kiveukoi/MainActivity$4.class
	bin/classes/com/kiveukoi/MainActivity$5.class
	bin/classes/com/kiveukoi/MainActivity$6.class
	bin/classes/com/kiveukoi/MainActivity.class
	bin/classes/com/kiveukoi/Profil$1.class
	bin/classes/com/kiveukoi/Profil$2.class
	bin/classes/com/kiveukoi/Profil.class
	bin/classes/com/kiveukoi/R$drawable.class
	bin/classes/com/kiveukoi/R$id.class
	bin/classes/com/kiveukoi/R$layout.class
	bin/classes/com/kiveukoi/R$menu.class
	bin/classes/com/kiveukoi/R$string.class
	bin/classes/com/kiveukoi/R$style.class
	bin/classes/com/kiveukoi/User.class
	bin/resources.ap_
	gen/com/kiveukoi/R.java
	res/layout/activity_accueil.xml
	res/layout/activity_ajout_modif.xml
	res/values/strings.xml
	src/com/kiveukoi/AjoutModif.java
	src/com/kiveukoi/MainActivity.java
	src/com/kiveukoi/User.java