fixup! Upgraded to Django 1.5
Merge pull request #6004 from open-craft/django17/braden-video-module

fixup! Upgraded to Django 1.5