Move admin.py back where it belongs.
Start using base.html
Removed icolor.
Fix login.py to work with base.html.
Merge branch 'staging' of github.com:visgence/portcullis into branding

Conflicts:
	graphs/templates/display_nodes.html