fix
aaaa
Merge branch 'master' into zbirka_base

Conflicts:
	application/modules/install/_install.php