Merge branch 'pr/1'

Conflicts resolved:
ckanext/dashboard/resources/styles/dashboard-view.css
ckanext/dashboard/resources/styles/dashboard-view.less