fix 添加注释
Merge remote-tracking branch 'origin/dev' into dev
Merge remote-tracking branch 'origin/dev' into dev
Merge remote-tracking branch 'origin/master' into dev
网站首页修改&&注册登录页面设计及其功能
首页冲突修复
1、聊天模块的修改、基本功能测试完成
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/main/webapp/WEB-INF/decorators.xml
1、聊天模块的修改、基本功能测试完成
Merge remote-tracking branch 'origin/dev' into develop