Changed 2k to 1556p and 4k to 2160p
Fixed invalid string to enum constant association
Merge branch 'master' of https://github.com/CasparCG/Server