Merge branch 'dev' of github.com:cismet/cids-server into dev
Merge branch 'dev' of github.com:cismet/cids-server into dev
fixes #46 better default getName and toString behaviour
Merge branch 'feature/46-better-default-getName-and-toString-behaviour' into dev