toto
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