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

Conflicts:
	protected/extensions/mailer/Mailer.php