bugfix continued
bugfixing continued
Merge branch 'develop' of git.mediadecision.lan:thomas.hummel/chameleon into merge