Merge branch 'dev' of github.com:cismet/cismet-gui-commons into dev