UI - design
Merge remote-tracking branch 'origin/master'

Conflicts:
	partials/cms/dashboard.js
UI - design