Meilenstein 2.8
Revert "Meilenstein 2.8"

This reverts commit 701745c5e20f585c3d25ed417ef5b1c144639d3c.
test
Merge branch 'master' of https://github.com/propra13-orga/gruppe46
test