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