incorporate changes from dev

Merged Fabian Nuraddin Alexander Gabel requested to merge dev into master

Rundgang video and Karsten Kruse Research topics

Merge request reports