Polje za prelaz
Merge branch 'master' into prelaz

Conflicts:
	prodaja.db