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

Conflicts:
	core/core.vcxproj.filters

diff --cc core/core.vcxproj
Simple merge

diff --cc core/core.vcxproj.filters
index 83dc27134915a221d06b1eab38e4eca32a6dc35a,a0d7356a5572efa2d28dd400659c88271159a515..788d617cfb4156bbac355b1855cc314c595a1c8e
--- 1/core/core.vcxproj.filters
--- 2/core/core.vcxproj.filters
+++ b/core/core.vcxproj.filters
@@@ -172,8 -172,8 +172,10 @@@
      <ClInclude Include="producer\variable.h">\r
        <Filter>source\producer</Filter>\r
      </ClInclude>\r
 +    <ClInclude Include="producer\scene\expression_parser.h">\r
 +      <Filter>source\producer\scene</Filter>\r
+     <ClInclude Include="producer\text\utils\text_info.h">\r
+       <Filter>source\producer\text\utils</Filter>\r
      </ClInclude>\r
    </ItemGroup>\r
    <ItemGroup>\r

diff --cc core/producer/text/text_producer.cpp
Simple merge

diff --cc core/producer/text/text_producer.h
Simple merge