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
Solve conflic
Added footer clearfix
Added tests for individual API endpoints + added tearDown method for api test
Merge branch 'develop' of github.com:jplusplus/detective.io into develop
Fixed lorem ipsum
Correct login form error
Updated tpl
Remove console.log cc @pbellon
Removed unused variable 'fields' in invididual.py
Added tests for individual patching in tests/api.py
Removed pytz's import from tests/api.py, was unused & crashing build
Added error message #88
Changed reset & reset confirm password urls
Added static pages
Merge branch 'develop' of github.com:jplusplus/detective.io into develop

Conflicts:
	app/detective/templates/partials/header.dj.html
	app/detective/templates/partials/login.dj.html
	app/static/detective/js/app.coffee
	app/urls.py
Started homepage integration