Merge for Beta

Robin Malte Engelrequested to merge
entwicklung into master

Before starting the Beta, we want to merge.

Merge request reports