work in progress for geolocation
GPS Activity pls back up
pulled
commit before pull, added GPS mode UI
Fixed merge conflicts
Some criteria stuff