Modified e131bridge.c
Merge branch 'master' of https://github.com/FalconChristmas/fpp

Conflicts:
	web/_notes/dwsync.xml
Fixed highlight of music on fileUpload.php