updated fig setup
Merge remote-tracking branch 'origin/staging' into dev

Conflicts:
	bin/dev_syncdb.sh
	fig.yml