Test récupération Geoloc
Merge branch 'master' of https://github.com/litil/Carpet

Conflicts:
	android/bin/CarpetAndroid.apk
	android/bin/classes.dex