Merge branch 'baseline_system_master' into 'baseline_system_development'

# Conflicts:
#   .gitignore
#   CHANGELOG.md
#   diva_evaluation_cli/__init__.py
#   diva_evaluation_cli/bin/cli.py
#   diva_evaluation_cli/bin/install.sh
#   doc/cli.md