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

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