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

Conflicts:
	config/routes.rb