some more tests
merge
Merge branch 'master' of github.com:domogik/domogik