Fixed #1037
Merge branch 'master' into refactor

Conflicts:
	entities/entities/chatindicator/init.lua
Merge branch 'refactor' of github.com:FPtje/DarkRP into refactor