fixed equation in renderbutterfly where bottom left 4 pixels are always stuck on.
Merge branch 'master' of https://github.com/smeighan/xLights

Conflicts:
	xLights/EffectsPanel.cpp
	xLights/EffectsPanel.h
	xLights/wxsmith/EffectsPanel.wxs