Pre-shutdown commit.
Merge branch 'master' of https://github.com/EliteTK/darkrpmodification

Conflicts:
	lua/darkrp_config/settings.lua

Merged settings fixes.