Merge remote-tracking branch...

Merge remote-tracking branch 'origin/hm-koester-lectures/promodsim2020/team-3/vadere-generalize_source' into hm-koester-lectures/promodsim2020/team-3/vadere-generalize_source
8 jobs for hm-koester-lectures/promodsim2020/team-3/vadere-generalize_source in 146 minutes and 24 seconds (queued for 14 seconds)