FEATURE: improvements in location detection.
Merge remote-tracking branch 'origin/master'

Conflicts:
	androidapp/AndroidManifest.xml