Bug fixes
Merge branch 'config' of https://github.com/reelyactive/smartspaces-server into config