a
Merge branch 'master' of https://github.com/cdelorme/collision-avoidance-warning

Conflicts:
	src/src/com/hackathon/collisionavoidance/GpsService.java