更新pom
Merge branch 'master' of github.com:chirowong/cms

Conflicts:
	pom.xml