Made charts work with static data
Merge branch 'master' into jc-dashboard-presenter

Conflicts:
	app/controllers/dashboard_controller.rb
	app/views/dashboard/index.html.erb