Merge branch 'master' of https://github.com/ronag/Server

Conflicts:
	core/core.vcxproj
	core/core.vcxproj.filters
	core/monitor/monitor.cpp
	core/monitor/monitor.h
	core/producer/frame_producer.cpp
	core/producer/layer.cpp
	core/producer/layer.h
	core/producer/layer/layer_producer.h
	core/producer/stage.cpp
	core/video_channel.cpp
	core/video_channel.h
	modules/decklink/producer/decklink_producer.cpp
	modules/ffmpeg/producer/ffmpeg_producer.cpp
	modules/flash/producer/flash_producer.cpp
	modules/image/producer/image_producer.cpp
	modules/image/producer/image_scroll_producer.cpp
	protocol/osc/client.cpp
	protocol/osc/client.h
	protocol/osc/oscpack/OscHostEndianness.h
	protocol/osc/oscpack/OscOutboundPacketStream.cpp
	protocol/protocol.vcxproj.filters
	shell/casparcg.config
	shell/server.cpp