Merge branch 'hotfix/bug_fixes'
Fixed bugs in switching between color types for probesets.
Merge branch 'hotfix/bug_fixes2' into develop