"css error changes"
Merge branch 'django' of https://github.com/sardawson/portal into sardawson-django

Conflicts:
	rootcause/settings.py
Merge branch 'sardawson-django' into django