fixes to parsing GPS coordinates

...
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/fydp/cpsapp/MainActivity.class
fix conflict for db line

...
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/fydp/cpsapp/MainActivity.class