Merge branch 'master' of https://git.gesis.org/dda/dda-wizard into master