Started work on adding effect engine config to HyperCon
Continues work on HyperCon for effect engine
Merge branch 'multi_colortransform'

Conflicts:
	CMakeLists.txt
	config/hyperion.config.json
Merge branch 'master' into add_effect_engine

Conflicts:
	include/hyperion/Hyperion.h
	libsrc/hyperion/Hyperion.cpp
	libsrc/jsonserver/JsonClientConnection.cpp
Merge remote-tracking branch 'remotes/origin/add_effect_engine' into add_effect_engine

Conflicts:
	CMakeLists.txt
	config/hyperion.config.json
	include/hyperion/Hyperion.h
	libsrc/hyperion/Hyperion.cpp
	libsrc/jsonserver/JsonClientConnection.cpp