Updated the design
Merge branch 'master' of https://github.com/pgarcia041993/deleaves

Conflicts:
	app/assets/javascripts/global.js
	app/views/dashboard/_table-dtl.html.erb