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

Conflicts:
	protected/controllers/SiteController.php