merge 2 repos
Merge branch 'master' of https://github.com/kremvit/smarthouse

merge to test
test merging