All the changes
Merge branch 'master' of https://github.com/EcoDashboard/eco

Conflicts:
	app/city_profile.html
	app/index.html
Removing dashboard from routing
Merge branch 'master' of https://github.com/EcoDashboard/eco