big commit for Hack4France
Merge branch 'master' of https://github.com/lelexxx/VisitMyCity

Conflicts:
	mobileApp/VisitMyCityAndroid/.idea/libraries/appcompat_v7_19_1_0.xml
	mobileApp/VisitMyCityAndroid/app/app.iml
	mobileApp/VisitMyCityAndroid/app/src/main/AndroidManifest.xml
	mobileApp/VisitMyCityAndroid/app/src/main/java/visitmycityandroid/activity/AddLocationActivity.java
	mobileApp/VisitMyCityAndroid/app/src/main/java/visitmycityandroid/activity/VisitMyCityActivity.java
	mobileApp/VisitMyCityAndroid/app/src/main/java/visitmycityandroid/asyncTask/JaccedeTask.java
	mobileApp/VisitMyCityAndroid/app/src/main/java/visitmycityandroid/configuration/Variables.java
	mobileApp/VisitMyCityAndroid/app/src/main/res/layout/activity_add_location.xml
	mobileApp/VisitMyCityAndroid/build/intermediates/dex-cache/cache.xml