nista..
Merge branch 'master' of https://github.com/milosnovi/employees_vacations

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.xml
	composer.lock
Merge branch 'master' of https://github.com/milosnovi/employees_vacations
- state iz string u konstante - promenjeno po kontrolerima