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