fixes
Merge branch 'staging' of github.com:itdoors/sd into staging

Conflicts:
	app/migration.sql