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'