Updated documentation, fix the script to cleanup ~temp files lefovers from gedit.
Merge remote-tracking branch 'ta/master'
Deleted the tmp files
unicorn-dashboard chat fixed
Merge remote-tracking branch 'origin'

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