Master

Reinier van der Wallerequested to merge
master into ta2

Update ta2 branch for testing the new commits of stat-313 in combination with updates of ta2.

Merge request reports