hechunping 790107ab40 Merge branch 'hcp' into test 1 rok pred
..
java 790107ab40 Merge branch 'hcp' into test 1 rok pred