Merge origin/master

Conflicts:
	application/l10n/SrL10N.php
Sve i svasta