Merge branch 'dev_vistoms_try_Benedikt' of...

Merge branch 'dev_vistoms_try_Benedikt' of https://bitbucket.org/imcovangent/kadmos into dev_vistoms_try_Benedikt


Former-commit-id: 53bdd636a6085119315fe381c289b825659ca901