better chat html
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/less/chat.less
	public/less/common.less
	views/chat.html