Chatbox style enhancement
Merge branch 'master' into tk-admin-interface

Conflicts:
	public/css/custom.css
fix chat css layout