Merge branch 'master' into mousetrap

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