unicorn-dashboard chat fixed
Merge remote-tracking branch 'origin'

Conflicts:
	public/assets/application.css
	public/assets/application.js
	public/assets/manifest.yml