fixup! Upgraded to Django 1.5
Merge pull request #5997 from open-craft/django17/braden-staticfiles

fixup! Upgraded to Django 1.5