Fixed #818
Fixed #817
Merge branch 'master' into refactor

Conflicts:
	gamemode/modules/afk/sv_AFK.lua
Reverted config
Merge branch 'master' into refactor