Fixed weird error
Merge branch 'master' into darkrpFPP

Conflicts:
	server/FPP_Settings.lua