Merge
Removed accusation request in the wrong location in server controller
Merge
Fixing ServerController merge