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

Conflicts:
	core/core.vcxproj
	core/core.vcxproj.filters

diff --cc core/core.vcxproj
index 1c3fc9358bb385814849c4b770df9889f9071d6b,9c5963e235a28c8b8eb9bf1079c6a63cffd00757..21cf3bf12783378a94f2ceec91d734af68b94d6d
--- 1/core/core.vcxproj
--- 2/core/core.vcxproj
+++ b/core/core.vcxproj
@@@ -247,7 -247,7 +247,8 @@@
      <Lib />\r
    </ItemDefinitionGroup>\r
    <ItemGroup>\r
+     <ClInclude Include="consumer\write_frame_consumer.h" />\r
 +    <ClInclude Include="consumer\synchronizing\synchronizing_consumer.h" />\r
      <ClInclude Include="mixer\audio\audio_util.h" />\r
      <ClInclude Include="mixer\gpu\fence.h" />\r
      <ClInclude Include="mixer\gpu\shader.h" />\r

diff --cc core/core.vcxproj.filters
index 5138ec7dced13f0f8bc90acecd1bd3224b4c2ad9,e040b2aa2d2faeb07ee714b457253bc32b7812fc..324ed653271263c03ae22639cfae3b5844764902
--- 1/core/core.vcxproj.filters
--- 2/core/core.vcxproj.filters
+++ b/core/core.vcxproj.filters
@@@ -43,9 -43,9 +43,12 @@@
      <Filter Include="source\monitor">\r
        <UniqueIdentifier>{d8525088-072a-47d2-b6e1-ad662881f505}</UniqueIdentifier>\r
      </Filter>\r
+     <Filter Include="source\producer\layer">\r
+       <UniqueIdentifier>{4e098e4c-7467-446f-990d-d4486d179edb}</UniqueIdentifier>\r
+     </Filter>\r
 +    <Filter Include="source\consumer\synchronizing">\r
 +      <UniqueIdentifier>{19ddc31c-5865-46d5-a8a6-a96d6fa1ffc7}</UniqueIdentifier>\r
 +    </Filter>\r
      <Filter Include="source\parameters">\r
        <UniqueIdentifier>{d04737a6-96b2-40cd-b1e7-e90b69006cd1}</UniqueIdentifier>\r
      </Filter>\r

diff --cc core/producer/stage.cpp
Simple merge

diff --cc core/producer/stage.h
Simple merge

diff --cc protocol/amcp/AMCPCommandsImpl.cpp
Simple merge