Updated version

Larry's version is 3.0
Merge branch 'master' of https://github.com/markkahrl/GPSApp

Conflicts:
	AndroidManifest.xml