GPS fixes for automatic
GPS fixes for automatic
Merge pull request #517 from jaypoulz/jp508

Jp508 -- GPS fixes are fixed for both automatic and manual.  Although I haven't tested manual.
Merge remote-tracking branch 'upstream/master' into ms516
Android Data Collector control flow and usability update