cuiyi1
guoyang
Merge branch 'develop' of https://github.com/ssapym/mytest into develop
cuiyi2
guoyang3
cuiyi3
Merge branch 'develop' of https://github.com/ssapym/mytest into develop

Conflicts:
	git_test.txt
Merge branch 'release/1.0'