user story 32+33 nearly finished
Merge branch 'master' of https://github.com/alexander-informatik/amos-project-audi