Updates chat logic and UI
Merge branch 'master' into develop

Conflicts:
	lib/chat_server.js