Izmjenjene sitnice
Merge branch 'master' of https://github.com/SoftLab-IS/ermex-pm
Merge branch 'master' of https://github.com/SoftLab-IS/ermex-pm
Sredjeni korisnici, nasminkan jedan radni nalog, skoro do kraja, i jos neke sitnice
Merge branch 'master' of https://github.com/SoftLab-IS/ermex-pm

Conflicts:
	cross-platform/protected/controllers/MaterijaliController.php
	cross-platform/protected/views/korisnici/_form.php