fx
Merge remote-tracking branch 'origin/dev' into dev
fx
页面微调
Merge remote-tracking branch 'origin/dev' into dev
Merge remote-tracking branch 'origin/dev' into dev
首页 &  注册页面整改 & 球房入驻加入联系方式验证
首页未开发的几个图标点击后提示"开发中"
直播间页面修改
fix 比分网页
Merge remote-tracking branch 'origin/dev' into dev
1、添加tadayMessage  获取当天聊天消息的历史记录
2、添加offtadayMessage 获取当天官方直播员聊天消息的历史记录
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/main/webapp/static/chat/js/client.js
设置导航条最小宽度，
Merge remote-tracking branch 'origin/dev' into dev
fix 比分模块
Merge remote-tracking branch 'origin/dev' into dev
1、直播间初步完成
2、bug无效 $('#chatOffHistory').scrollTop(chatOffHistory.scrollHeight);
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/main/java/com/huake/web/controller/mgr/ChatController.java
比分页面，节点过滤，样式修改，