Merge develop and fix conflict

.gitignore

test/run_pytest.sh

test/test_meta_postprocess.py

video_prediction_tools/HPC_scripts/config_train.py

..._tools/HPC_scripts/preprocess_data_era5_step2_template.sh

...prediction_tools/HPC_scripts/train_model_era5_template.sh

..._tools/HPC_scripts/visualize_postprocess_era5_template.sh

video_prediction_tools/analysis_config/analysis_test.json

video_prediction_tools/data_preprocess/dataset_options.py

...prediction_tools/data_preprocess/preprocess_data_step2.py

...tools/docs/discussion/20201112_AMBS_report_to_Martin.pptx

video_prediction_tools/docs/discussion/discussion.md

...iscussion/ea-application-DeepACF-de_stadtler+michael.docx

...on_tools/docs/discussion/ea-application-DeepACF_Bing.DOCX

video_prediction_tools/env_setup/create_env.sh

...rediction_tools/env_setup/generate_workflow_runscripts.sh

video_prediction_tools/hparams/era5/savp/model_hparams.json

video_prediction_tools/main_scripts/main_meta_postprocess.py

...ediction_tools/main_scripts/main_preprocess_data_step2.py

video_prediction_tools/main_scripts/main_train_models.py