minor jalopy changes
Merge branch 'feature/209-refactoring-cidsstyledialogfactory' into dev
Merge branch 'dev' of github.com:cismet/cismap-commons into dev