refactoring
Merge branch 'master' of https://github.com/lelexxx/VisitMyCity

Conflicts:
	mobileApp/VisitMyCityAndroid/app/src/main/java/visitmycityandroid/activity/MapsActivity.java