Merge branch 'dev' of git.embl.de:grp-zeller/SIAMCAT into dev