interim checkin to work with don julien
Merge branch 'master' of https://github.com/smeighan/xLights

Conflicts:
	xLights/RenderFaces.cpp