Fixed chat issue
Merge remote-tracking branch 'origin/master'

Conflicts:
	chat/lib/template/loggedIn.html