Eric 552768d937 Merge branch 'dev_v1.3.5_20220929' into online 2 rokov pred
..
java 1e524fdf2a fix 2 rokov pred
resources 4f8d6a659b update 2 rokov pred