Merge remote-tracking branch 'origin/JochenBranch'

Conflicts:
	geoGraph.js