Start GPS Service
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidApp/AndroidManifest.xml