fixed the scrollarea of the chat
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/custom.css
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
fixed the scrollarea of the chat
added new json events
edited json events