Merge branch 'add_2020_20201_Settings' into 'master'

Add 2020 2021 settings

See merge request !9
1 job for master
Status Name Job ID Coverage
  Deploy
passed build-image