Fixed #974
Fixed #977
Fixed seperate separate thing
Merge branch 'master' into refactor

Conflicts:
	gamemode/init.lua
	gamemode/shared/MakeThings.lua