Merge branch 'dev' of https://github.com/cismet/cids-server into dev