.
Merge branch 'master' of https://github.com/rogerbern/gpstracker
Gui Prototype
Updates for Gui-Mock