format
Merge branch 'origin/master'

Conflicts:
	GQ_Android/src/edu/bonn/mobilegaming/geoquest/HotspotOld.java