修改pom文件
Merge branch 'master' of github.com:DolphinBoy/cloudwave-core

Conflicts:
	pom.xml