Merge pull request #16 from jarvys/master

完善页面
logic
chat logic
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