Merge branch 'master' of https://github.com/taojintianxia/Incubator.git

Conflicts:
	src/test/Test.java
merge pom file
Merge branch 'master' of https://github.com/taojintianxia/Incubator.git