test#1
testgit#1
testgit#2
test3
dernier test ?
.
Merge remote-tracking branch 'origin/dev_matthieu'

Conflicts:
	.classpath
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes.dex
	bin/classes/com/example/tppromenades/MainActivity.class
	bin/classes/com/example/tppromenades/R$drawable.class
	bin/classes/com/example/tppromenades/R$id.class
	bin/classes/com/example/tppromenades/R$layout.class
	bin/classes/com/example/tppromenades/R$menu.class
	bin/classes/com/example/tppromenades/R$string.class
	bin/classes/com/example/tppromenades/R$style.class
	bin/dexedLibs/android-support-v4-2e958b13970b957dc1b8b6e5e57e7dfe.jar
	bin/resources.ap_
	bin/tpPromenades.apk
	gen/com/example/tppromenades/R.java
	project.properties
	res/layout/activity_main.xml
	src/com/example/tppromenades/MainActivity.java