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

Conflicts:
	zAppv1/src/com/example/zappv1/Recommandation.java