Merge branch 'master' of github.com:itdoors/sd
Merge remote-tracking branch 'origin/staging'
test commit
Merge branch 'master' of github.com:itdoors/sd

Conflicts:
	src/Lists/OrganizationBundle/Resources/translations/ListsOrganizationBundle.ru.yml
Merge remote-tracking branch 'origin/staging'
Merge remote-tracking branch 'origin/staging'
Merge remote-tracking branch 'origin/staging'
task-540-tree
task-417-del-html
task-417-del-html
Merge branch 'task-417-del-html' into staging

Conflicts:
	composer.lock
Merge branch 'staging' of github.com:itdoors/sd into staging
handling = close || open for salesadmin (add RESULT_COMPETITOR)
phpcs