GPS getlocation
Update getlocation
Update getLocation()
Merge remote-tracking branch 'origin/master' into sept20

Conflicts:
	GoogleCertificate/bin/GoogleCertificate.apk
	GoogleCertificate/bin/classes.dex
	GoogleCertificate/bin/resources.ap_