Merge branch 'dev' of github.com:cismet/cids-custom-wuppertal-server into dev
fixed #20
Merge branch 'bug/20-init-error' into dev