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

Conflicts:
	gamemode/server/data.lua
	gamemode/server/main.lua
Fixed a couple of Lua errors with rp_setmoney and rp_setsalary.
Merge branch 'refactor' of github.com:FPtje/DarkRP into refactor
Merge pull request #822 from Bo98/setmoney-setsalary-fixes

Fixed a couple of Lua errors with rp_setmoney and rp_setsalary.
Got rid of player.lua
removed gamemode/server/player.lua from includes