need to make lower case
Merge branch 'master' of https://github.com/FalconChristmas/fpp

Conflicts:
	web/PixelnetDMX.php
	web/uploadFile.php
lower case