Merge from source
Merge branch 'master' of github.com:youanden/xhab-control-panel