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'
lookup -> role
Merge remote-tracking branch 'origin/staging'