fix merge issue
merge conflict
Merge branch 'master' of https://github.com/smeighan/xLights

Conflicts:
	README.txt
	xLights/EffectsPanel.h

added flag to process enter key in RenderOn.cpp
Merge branch 'master' of https://github.com/smeighan/xLights
updated some release notes for 3.6.14
Merge branch 'master' of https://github.com/smeighan/xLights

Conflicts:
	README.txt
Merge branch 'master' of https://github.com/smeighan/xLights
Updated Don's comment in README to indicate that this is an enhancement, not a temporary enhancement.