客服端测试2
Merge remote-tracking branch 'choose_remote_name/master' into server

Conflicts:
	src/com/xs/test/Test.java