работа с юзерами
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Sir/OtBundle/Resources/views/User/index.html.twig
	web/bundles/sirot/css/main.css
работа с юзерами