Merge branch 'staging' into shib-auth

.bumpversion.cfg

.gitlab-ci.yml

README.md

cache/Dockerfile

client/Dockerfile

client/html/45a3a700e0f6685a2676.worker.js

client/html/prism.js

config/dem_index-dev.html

config/dem_index-ops.html

config/emg_index-dev.html

config/emg_index-ops.html

config/vhr18_index-dev.html

config/vhr18_index-ops.html

conftest.py

core/Dockerfile

docker-compose.base.ops.yml

docker-compose.dem.dev.yml

docker-compose.dem.ops.yml

docker-compose.emg.dev.yml

docker-compose.emg.ops.yml