merged device manager
Merge branch 'master' of https://github.com/NomeAutomation/NomeAutomation