Fix push error
Merge branch 'v0.01' of https://github.com/brantunger/GPSLocator into local v0.01

Conflicts:
	trackingapp/src/main/AndroidManifest.xml