Merge branch 'hotfix/poslovanje-skrij-razlika-povprecje'
Merge branch 'master' into develop