omg changes to finally get the dashboard working
Merge branch 'master' of https://github.com/EcoDashboard/Backend

Conflicts:
	app/views.py