Merge pull request #31 from selvinfehric/master

1/11
1/11
Merge branch 'master' of https://github.com/bra19/zaposlise

Conflicts:
	protected/controllers/SiteController.php
Merge pull request #40 from bra19/master

updates