zakljucan profil korisnika odmah pri registraciji ... nova migracija baze (uklonjeno is_approved)...
Merge branch 'master' of https://github.com/milosnovi/employees_vacations

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.xml
	src/Ates/UserBundle/Resources/views/Profile/show.html.twig
manje promene nad adminController i registrationController-om
Merge branch 'master' of https://github.com/milosnovi/employees_vacations

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.xml
	src/Ates/UserBundle/Controller/AdminController.php
	src/Ates/UserBundle/Resources/config/routing.yml
	src/Ates/UserBundle/Resources/views/Admin/panel.html.twig