Fixed function name conflicts with Customisable Weaponry.
Merge pull request #959 from Bo98/resetbones-fix

Fixed #958 (since I already had fixed it)
DarkRP Info File

Don't edit config files. Causes conflicts when updating.
Merge pull request #965 from Ideal-HostingUG/refactor

DarkRP Info File
Recoded door system.
Huge speed improvement both serverside and clientside.
Please test
Merge branch 'refactor' of github.com:FPtje/DarkRP into refactor
Merge branch 'master' into refactor
Renamed DarkRP Derma skin texture. Fixes #960
Added derma theme to the resources list
Blind attempt at fixing derma theme not being sent
Case sensitivity
Fixed blocked models error with MySQL
Merge branch 'master' into darkrpFPP

Conflicts:
	lua/_MySQL.lua
	server/FPP_Settings.lua
Merge branch 'darkrpFPP'
spelling mistake
FPP update
Merge branch 'darkrpFPP'
I'm starting to hate these blind updates and merge to test
Merge branch 'darkrpFPP'
FFS