make sure we only use test db for testing
Merge branch 'client-dev' of github.com:theodi/colleen into client-dev

Conflicts:
	workers/worker.js