Removed ununsed imports
Integrated energy landing page
Added footer
Merge branch 'develop' of github.com:jplusplus/detective.io into develop

Conflicts:
	app/detective/apps/common/user.py
	app/static/detective/js/controllers/IndividualSearchCtrl.coffee