Merge remote-tracking branch 'origin/report' into 'master'.

This commit will introduce the newest changes of the report to the master branch.
However the report is not yet done.
I will first prepare the hand in and then I will spend the rest of my time to actually correct the report.
So a few commits will be added later.