Updates to web page and fppd
Merge branch 'master' of https://github.com/FalconChristmas/fpp

Conflicts:
	web/_notes/dwsync.xml