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

Conflicts:
	modules/image/util/image_algorithms.cpp

diff --cc modules/psd/psd.vcxproj
Simple merge

diff --cc shell/casparcg.config
index f0db733a79241abd68587a78d10f904e98b6a94c,f0db733a79241abd68587a78d10f904e98b6a94c..210481e3dd5152f7f0355168beb021439dea9604
--- 1/shell/casparcg.config
--- 2/shell/casparcg.config
+++ b/shell/casparcg.config
@@@ -11,7 -11,7 +11,7 @@@
    </flash>\r
    <channels>\r
      <channel>\r
--      <video-mode>PAL</video-mode>\r
++      <video-mode>576p2500</video-mode>\r
        <consumers>\r
          <screen>\r
            <device>1</device>\r