deveranje sa userima
Merge branch 'master' of https://github.com/SoftLab-IS/budimoljudi

Conflicts:
	protected/views/site/index.php