modif derniere
Merge remote-tracking branch 'origin/master' into newmaster
new
planning fragment
Merge branch 'david-planning'

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
a