server updates
Merge branch 'master' of https://github.com/joshuajnoble/studio-sensors