first test
Merge branch 'master' into frontend-tests
Merge branch 'master' into frontend-tests
test for work REST operations
merge master
tests with user support
[backend] Use catalog.config for loading settings.
Remove run-local.py
[frontend] Load configuration using parse-env
Merge branch 'master' into config-refactoring

Conflicts:
	frontend/lib/sessions.js
get works
Merge branch 'docker-postgres' into config-refactoring
[backend] Use real broker URL for initializing Celery
More docker tweaks
REST test for source and post
fixed module calls issue
Initialize databases from a single script
Docker image for postgres
Merge branch 'docker-postgres' into config-refactoring
Merge branch 'master' into config-refactoring

Conflicts:
	docker/postgres/run.sh