ispravio prema mojim biljeskama sa ticketa #33937
Merge branch '33922'

Conflicts:
	epdv/epdv_tarifa_utils.prg
Merge branch 'master' of github.com:knowhow/F18_knowhow