no message
Merge branch 'master' of https://github.com/v-well/v-well

# By ruby
# Via ruby
* 'master' of https://github.com/v-well/v-well:
  gps

Conflicts:
	V-WELL/src/net/fireinjection/vwell/MapActivity.java