dodat entitet Korisnik.php
Merge branch 'master' of https://github.com/boogyman89/ates_odmori

Conflicts:
	app/AppKernel.php
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	composer.json
	composer.lock
	vendor/autoload.php
	vendor/composer/autoload_real.php
DB migration, skripta sa tabelom korisnik