项目：以SpringMVC为基础的框架，建设中...
Merge branch 'master' of https://github.com/DolphinBoy/cloudwave-core

Conflicts:
	.gitignore