dev-infra

Merge branch 'master' of https://dev.flarecast.eu/stash/scm/infra/dev-infra

Conflicts:
	baseimages/postgres/flarecast_workflow.architect
	baseimages/postgres/flarecast_workflow.sh
	baseimages/postgres/flarecast_workflow.sql