Gestion de l'ajout des amis dans la base
Merge branch 'master' of https://github.com/Popom/Roady

Conflicts:
	Appli/assets/www/javascript/ajoutAmi.js
	Appli/bin/MainActivity.apk
	Appli/bin/resources.ap_