commit G
Merge branch 'master' of https://github.com/guithieb/PFE1320

Conflicts:
	zAppv1/bin/AndroidManifest.xml