Merge branch 'develop'

Conflicts:
	.gitlab-ci.yml
	video_prediction_tools/main_scripts/main_visualize_postprocess.py
	video_prediction_tools/utils/runscript_generator/setup_runscript_templates.sh