zoujiajian 7b31091fca Merge branch 'master' into pre 2 rokov pred
..
java 0c880c2224 Merge branch 'master' into pre 2 rokov pred
resources 27209db6e2 fix 2 rokov pred