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

Fixed #958 (since I already had fixed it)
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
Merge branch 'darkrpFPP'
Added addon.txt
Fixed #966
Fixed https://github.com/FPtje/DarkRP/issues/971 part 1
Fixed https://github.com/FPtje/DarkRP/issues/971 Part 2
'merge'
Made text wrapping algorithm awesome
Fixes #972
Fixed #34.
Haha!
Fixed #974