fix
Merge branch 'master' into demo

Conflicts:
	chat.html
Merge branch 'master' into demo
Merge branch 'master' into demo
fix