hj
maj
Merge remote-tracking branch 'origin/david-planning' into Branch_Alex

Conflicts:
	appli-puy/bin/appli-puy.apk
	appli-puy/bin/classes.dex
	appli-puy/bin/resources.ap_
a