Misc changes
Merge branch 'master' of https://github.com/CasparCG/Server
Some refactoring based on the new parameters class
Misc refactoring and fixes
Merge remote-tracking branch 'origin/master' into ffmpeg-update