京东
Merge branch 'master' of https://github.com/huuuxi/TestJava.git

Conflicts:
	TestJava/pom.xml