Merge branch 'master' of https://github.com/arikalfus/OperationNightlife
idea junk
moved server decl to top for leiner/emacs convenience
trying to get group ctroller working...
fixed conflicts in main and in server