chartto Annotated Time Line
Merge branch 'master' of https://github.com/wellincall/charts_test_api_SRC

Conflicts:
	.idea/workspace.xml
	Charts/energy_and_occupants/views.py
	Charts/populate_database.py