Merge branch 'chroma-wip' into 2.0.x-cp
wip: using the same hostbuffer binding.
Merge branch 'layout_producer_push' into layout_producer

Conflicts:
	core/producer/layer/layer_producer.cpp
	core/producer/stage.cpp
layer-producer: fix print reporting.
layer-producer Change to use ROUTE 1-2 3-4 command syntax.
Merge branch 'layout_producer_push' into layout_producer
Merge branch 'build-cp' into build-cp-vcexpress
Merge branch 'build-cp' into build-cp-vcexpress

Conflicts:
	.gitignore
	modules/decklink/decklink.vcxproj
	shell/shell.rc
	shell/shell.vcxproj
Fixed flash.vcxproj that went the wrong way.
layer_producer feature: Added support for route://<channel>-<layer> in PLAY and LOADBG

Conflicts:
	core/core.vcxproj
	core/core.vcxproj.filters
	core/producer/layer/layer_producer.cpp
	core/producer/stage.cpp
	core/producer/stage.h
	protocol/amcp/AMCPCommandsImpl.cpp
layer_producer feature: Added support for route://<channel>-<layer> in PLAY and LOADBG
Merge branch 'layout_producer' into build-cp-vcexpress

Conflicts:
	protocol/amcp/AMCPCommandsImpl.cpp
AMCPCommands merge not quite correct.
ffmpeg dshow: Fix packet life preserver in video_decoder and revert move of packet pop.

Conflicts:
	modules/ffmpeg/ffmpeg.cpp
	modules/ffmpeg/producer/video/video_decoder.cpp
Merge branch 'build-cp-vcexpress' into build-cp
Fix up vcxproj files that went astray.