Updates from Master

Merged Dominik Hebeler requested to merge master into 57-die-settingsseite-ubersetzen

Merge request reports