Merge remote-tracking branch 'remotes/origin/master' into branchone

Conflicts:
	src/main/java/com/cn/ifeng/helloworld/Test.java
test
test1