Creation de MySQLiteHelper
BDD interne
BDD interne
bdd interne
Merge remote-tracking branch 'origin/upstream/master'

Conflicts:
	Mambiances/AndroidManifest.xml
	Mambiances/bin/AndroidManifest.xml
	Mambiances/bin/R.txt
	Mambiances/bin/classes/com/google/android/gms/R$drawable.class
	Mambiances/bin/classes/com/pappl/mambiances/MapActivity.class
	Mambiances/bin/classes/com/pappl/mambiances/R$drawable.class
	Mambiances/bin/classes/com/pappl/mambiances/R$id.class
	Mambiances/bin/classes/com/pappl/mambiances/R$integer.class
	Mambiances/bin/classes/com/pappl/mambiances/R$layout.class
	Mambiances/bin/classes/com/pappl/mambiances/R$menu.class
	Mambiances/bin/classes/com/pappl/mambiances/R$string.class
	Mambiances/bin/classes/com/pappl/mambiances/R$style.class
	Mambiances/bin/classes/com/pappl/mambiances/R$styleable.class
	Mambiances/bin/classes/com/pappl/mambiances/R$xml.class
	Mambiances/gen/com/google/android/gms/R.java
	Mambiances/gen/com/pappl/mambiances/R.java
	Mambiances/project.properties
Merge pull request #1 from florem92/master

Test pour essayer de merge?