gaodm 767f51b525 Merge branch 'develop' into dev/mix20191111_BIcount 5 rokov pred
..
main 767f51b525 Merge branch 'develop' into dev/mix20191111_BIcount 5 rokov pred
test 0b9dd1dfda 初始版本 6 rokov pred