forma akcije
Merge branch 'master' of https://github.com/SoftLab-IS/budimoljudi

Conflicts:
	protected/views/action/_form.php
vju jedna akcija
Merge branch 'master' of https://github.com/SoftLab-IS/budimoljudi