解决冲突
Merge branch 'master' of git@github.com:zzwell/parent.git

Conflicts:
	pom.xml