Fix typed message removed when message received
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/conversation.html