some changes
Revert "some changes"

This reverts commit b7bda065ecd52b2a74751226006ed01510321c12.
Merge branch 'develop'
Merge branch 'master' of https://github.com/Uni-Heidelberg/Uni-HD-App