Merge branch 'design-work'

Conflicts:
	app/views/dashboard/index.html.erb