geolocation in view
Merge branch 'master' of https://github.com/Patrick-Fieger/Radar-for-Adaptive-Club-Recommender

Conflicts:
	index.html