Fixed typo
Implements issue #291, except for the tree table with teaching materials
Merge remote-tracking branch 'upstream/develop' into #291
Cleanup
Merge remote-tracking branch 'upstream/develop' into #291
Merge pull request #325 from Junkern/#291

#291