fix js escaping
Merge branch 'master' into develop

Conflicts:
	src/app/code/community/Diglin/Chat/Block/Display.php