Scrollable message
Merge branch 'master' of https://github.com/mjvallin/telecom

Conflicts:
	src/client/js/chatimplementation.js