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