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 'master' into refactor

Conflicts:
	gamemode/fpp/FPP_DefaultBlockedModels.lua
	gamemode/fpp/server/FPP_DefaultBlockedModels.lua
	gamemode/init.lua
	gamemode/modules/fpp/pp/FPP_DefaultBlockedModels.lua
Merge branch 'darkrpFPP'
Merge branch 'master' into refactor
Added addon.txt
Added options to set people as admin in the config.
Apparently it's hard to do otherwise
Added on pocket added and removed hooks
Little pocket bug
txt file more info
Fixed #966
Merge branch 'master' into refactor
Fixed noclip stuttering described in #961