newest changes (Rebekka and Kristof) into master

Merged Fabian Nuraddin Alexander Gabel requested to merge dev into master

Merge request reports