完善聊天界面
Merge pull request #17 from longyueyi0610/master

chat logic
完善聊天页面
Merge pull request #18 from jarvys/master

完善聊天界面
完善页面细节
Merge remote-tracking branch 'upstream/master'

Conflicts:
	haoshimai/app/assets/css/framework.css
Merge pull request #19 from jarvys/master

完善页面细节
完善细节
添加问询历史测试数据
Merge pull request #20 from jarvys/master

完善细节
替换logo
Merge pull request #21 from jarvys/master

替换logo
fix
Merge remote-tracking branch 'upstream/master'
fix