fixed syntax error @chat ...^^"
Merge remote-tracking branch 'origin/master'

Conflicts:
	dev/app/js/classes/Chat.js
fixed syntax error @chat ...^^"