zavrseno editovanje usera od strane admina
dodeljivanje role super_admin useru
konzolna skripta za dodavanje slobodnih dana userima na pocetku godine
Merge branch 'master' of https://github.com/milosnovi/employees_vacations

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.xml
	app/config/routing.yml
	composer.json
	src/Ates/UserBundle/Entity/User.php
	src/Ates/UserBundle/Entity/User.php~
	src/Ates/VacationBundle/Controller/DefaultController.php