Dashboard.html updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/app.css
	css/bootstrap.min.css
	partials/dashboard.html
Merge remote-tracking branch 'origin/master'
Styling updates