test
Merge branch 'master' of https://github.com/Chris-Zhang-/cd_linux

test
Merge branch 'master' of https://github.com/Chris-Zhang-/cd_linux

Conflicts:
	build.xml
test2
1202