Merge branch 'dev' of github.com:cismet/cids-server into dev
Merge branch 'dev' of github.com:cismet/cids-server into dev
Merge branch 'dev' of github.com:cismet/cids-server into dev
Merge branch 'dev' of github.com:cismet/cids-server into dev
Merge branch 'dev' of github.com:cismet/cids-server into dev
Merge branch 'dev' of github.com:cismet/cids-server into dev
Merge branch 'dev' of github.com:cismet/cids-server into dev
Merge branch 'dev' of github.com:cismet/cids-server into dev
Merge branch 'dev' of github.com:cismet/cids-server into dev
Merge branch 'dev' of github.com:cismet/cids-server into dev
introducing new UserAwareServerAction composing existing interfaces ServerAction and UserStore
#44 formatting
Merge branch 'feature/44-user-aware-server-action' into dev
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
fixes #47: null check to prevent NPE
Merge branch 'bug/47-NPE-in-default-toString' into dev
working on #48: CidsBean JSON Improvements