问题单号：[N/A]
修改人员：[gjl]
修改说明：[修改HelloWorld。]
修改模块：[HelloJava]
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	com.gjl.helloworld/src/com/gjl/helloworld/main/HelloWorld.java