Revert "Merge Zeugs entfernt"

This reverts commit 5052e31b5219a76c71f0a20f55e8002cb14d6765.
Revert "Revert "Merge Zeugs entfernt""

This reverts commit f6350b940908e01be03b54f836118e732bd5cc26.
Merge remote-tracking branch 'origin/master'