Configuration bug fix
Merge branch 'dev' of ssh://github.com/vades/zwave-expertui into mh