Fixes to Server variables
Merge branch 'master' of github.com:safesoftware/spatialdashboard