registracija, zahtevi, oblasti
registracija, zahtevi, oblasti
registracija, zahtevi, oblasti
Merge branch 'master' of https://github.com/gekoni/psi_projekat

Conflicts:
	Enciklopedija/application/controllers/login.php
	Enciklopedija/application/models/Entity/Korisnik.php
	Enciklopedija/application/models/Proxies/__CG__EntityUloga.php
	Enciklopedija/css/black.css
registracija, zahtevi, oblasti