updates to ui

Signed-off-by: Nicholas Jackson <nic@thatlondon.com>
Merge remote-tracking branch 'github/1.3' into v1.3beta
Add map + new protocol
Merge branch 'v1.3beta' into mock_location
Mock spiral