Moved the registerclasses function and list of classes to utils
Added the Master server functionality except for chat
Fixed some merge conflicts
Fixed imports and stuff so everything compiles again