1、聊天模块的修改、基本功能测试完成
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/main/webapp/WEB-INF/decorators.xml