changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/cloud_dashboards/_dash_index_page.html.erb