Merge branch 'dev' of github.com:cismet/cids-custom-wuppertal-server into dev
Merge branch 'dev' of github.com:cismet/cids-custom-wuppertal-server into dev
minor jalopy changes