BecameKing fully tested
Merge branch 'groupmaster' of https://github.com/gKSD/server into groupmaster