hixie76 fix...
Merge branch 'develop' of github.com:mknx/smarthome into develop