合并pom
Merge branch 'master' of https://github.com/skmbw/test.git

Conflicts:
	test/pom.xml