parcours json
listSpectacle
Merge branch 'david-developp'

Conflicts:
	appli-puy/bin/R.txt
	appli-puy/bin/appli-puy.apk
	appli-puy/bin/classes.dex
	appli-puy/bin/resources.ap_
	appli-puy/src/fr/exia/appli_puy/ActivityAcceuil.java
	appli-puy/src/fr/exia/appli_puy/ActivitySpectaclesEtServices.java
toto
liste spectacle et service
a
Merge remote-tracking branch 'origin/david-developp'

Conflicts:
	appli-puy/bin/appli-puy.apk
	appli-puy/bin/classes.dex
	appli-puy/bin/resources.ap_
maj code alan david
list mon planning
heure HH:mm
Merge remote-tracking branch 'origin/Branch_Alex' into testRassemblement

Conflicts:
	appli-puy/bin/R.txt
	appli-puy/bin/appli-puy.apk
	appli-puy/bin/classes.dex
	appli-puy/bin/resources.ap_
	appli-puy/gen/fr/exia/appli_puy/R.java
	appli-puy/res/values/strings.xml
	appli-puy/src/fr/exia/appli_puy/ActivityAcceuil.java
	appli-puy/src/fr/exia/appli_puy/ActivityMonPlanning.java
	appli-puy/src/fr/exia/appli_puy/ActivitySpectaclesEtServices.java
a
a
push navigation