organizationUser lookupId change roleId
task-904-invoice
Merge branch 'task-904' into staging

Conflicts:
	app/migration.sql
phpcs
html botton
html invoice
task-904-invoice
task-904-invoice
task-904-invoice
task-578-invoice
tasks for kiwa
test
Merge branch 'staging' of github.com:itdoors/sd into staging

Conflicts:
	src/SD/CalendarBundle/Form/TaskForm.php
Merge branch 'staging' of github.com:itdoors/sd into staging
tasks upgraded
task-775
Merge branch 'staging' of github.com:itdoors/sd into staging

Conflicts:
	app/migration.sql
Merge branch 'staging'