soobin c1f9127e5e Merge branch 'master' into test 2 rokov pred
..
szwl c1f9127e5e Merge branch 'master' into test 2 rokov pred