90% db coverage
Merge branch 'groupmaster' of https://github.com/gKSD/server into groupmaster
Merge branch 'groupmaster' of https://github.com/gKSD/server into groupmaster