Merge branch 'master' into dev_vistoms_try_Benedikt

# Conflicts:
#	kadmos/vistoms/vistoms.py

--> Used version from dev_vistoms_try_Benedikt since they are up to date!


Former-commit-id: 118ac9dcedcc88c939736a1bca84459158d6b513