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

Conflicts:
	Charts/energy_and_occupants/views.py
	Charts/templates/energy_and_occupants/login.html
	Charts/templates/energy_and_occupants/register.html