Chart display new metrics with checkbox
Merge branch 'master' of https://github.com/wellincall/charts_test_api_SRC

Conflicts:
	Charts/templates/energy_and_occupants/building_page.html
	Charts/templates/energy_and_occupants/chart_controls.html
solved conflicts
Merge branch 'master' of https://github.com/wellincall/charts_test_api_SRC