合并pom文件
Merge branch 'master' of https://github.com/skmbw/vteba-utils.git

Conflicts:
	vteba-utils/pom.xml