test commit
test
test
test_test
test
Merge branch 'staging' of github.com:itdoors/sd into staging

Conflicts:
	app/migration.sql
	src/Lists/DogovorBundle/Resources/views/Dogovor/edit.html.twig
	src/SD/CommonBundle/Resources/views/AjaxForm/organizationUserForm.html.twig
	src/SD/UserBundle/Form/UserNewStuffForm.php
	src/SD/UserBundle/Resources/translations/validators.ru.yml
	src/SD/UserBundle/Resources/views/Security/login.html.twig
My news finished
Merge branch 'staging' of github.com:itdoors/sd into staging
Merge branch 'alex' of github.com:itdoors/sd into alex
test
Merge branch 'alex' of github.com:itdoors/sd into alex
sorting
Merge branch 'staging' into alex
Merge branch 'alex' of github.com:itdoors/sd into alex
All done
Merge branch 'alex' of github.com:itdoors/sd into alex
test
test
Code formatting
Merge branch 'alex' of github.com:itdoors/sd into alex