task-390
task-390
task-390
task-390
fix
task-390
quick tasks fixes
task-390
task-390
task-766-invoice
task-766-invoice
Merge branch 'staging' of github.com:itdoors/sd into staging
task-766-invoice
task-390
Merge branch 'task-390' into staging

Conflicts:
	app/migration.sql
task-390
task-390
task-390
task-390
task-390