Changes
Merge branch 'master' of https://github.com/sgringwe/heatmap

Conflicts:
	app/controllers/dashboards_controller.rb