Com
Merge branch 'master' of https://github.com/goraga1/health-gps

Conflicts:
	bin/AndroidManifest.xml
	bin/HealthGPS.apk
	bin/classes.dex
	bin/res/drawable-xxhdpi/map.png
	gen/com/example/healthgps/R.java
	project.properties
Merge branch 'master' of https://github.com/goraga1/health-gps