* support for clearing/overriding a channel lock
* some refactoring i psd + support for rectangular vector-masks
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0

Conflicts:
	modules/psd/psd_scene_producer.cpp

* added support for solid colors in scene_producer factory