Merge remote-tracking branch 'origin/staging'
Merge remote-tracking branch 'origin/staging'
Merge branch 'master' of github.com:itdoors/sd
task 915 done
task-918-919-organization
task-918-919-organization
Merge branch 'master' of github.com:itdoors/sd
task-918-919-organization
fix
task-918-919-organization
Merge branch 'master' of github.com:itdoors/sd
Merge branch 'master' into staging

Conflicts:
	app/migration.sql
	src/Lists/OrganizationBundle/Entity/Organization.php
	src/Lists/OrganizationBundle/Resources/config/doctrine/Organization.orm.yml
	src/Lists/OrganizationBundle/Resources/views/Sales/edit.html.twig