Template
Merge branch 'master' of https://github.com/wellincall/charts_test_api_SRC

Conflicts:
	Charts/energy_and_occupants/urls.py
	Charts/energy_and_occupants/views.py