Merge branch 'multi_colortransform'

Conflicts:
	CMakeLists.txt
	config/hyperion.config.json
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	CMakeLists.txt
	config/hyperion.config.json