Fixed #815
Fixed #819
Merge branch 'master' into refactor

Conflicts:
	gamemode/server/data.lua
	gamemode/server/main.lua
Merge branch 'refactor' of github.com:FPtje/DarkRP into refactor