Merge branch 'master' into differentauth

.gitlab-ci.yml

apiserver/config/settings.py

apiserver/main.py

apiserver/storage/EncryptedJsonFileStorageAdapter.py

apiserver/storage/JsonFileStorageAdapter.py

apiserver/storage/LocationStorage.py

apiserver/storage/__init__.py

deploy_scripts/cloudinit.yml

deploy_scripts/deployment.sh

docker-compose.yml

frontend/templates/base.html.jinja

proxy_image/default_location

requirements.txt