assoc 5 fixes
Merge branch 'dev' of ssh://github.com/vades/zwave-expertui into mh
Merge branch 'mh' of https://github.com/vades/zwave-expertui into dev