Merge branch 'release/2.0.0rc10'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
thermostat fix
Merge branch 'develop'
Merge branch 'master' of https://github.com/Z-Wave-Me/home-automation-ui
Merge branch 'develop'
Merge branch 'master' into develop