demo support
long words fix
Merge branch 'master' into demo

Conflicts:
	chat.html