same changes and unit-test
some new changes!
some UI changes
Merge branch 'master' of https://github.com/artpetro/matterhorn-manager-impl