Added scroll to chatbox
Merge remote-tracking branch 'origin/feature/chat' into feature/chat

Conflicts:
	app/partials/states/chatbox.html