Minor
Merge branch 'develop'
Merge branch 'master' of https://github.com/Z-Wave-Me/home-automation-ui