lvy cb91ae0694 Merge branch 'dev-table' into dev 1 mesiac pred
..
java cb91ae0694 Merge branch 'dev-table' into dev 1 mesiac pred