Allow XBlocks to be used with django 1.6
Merge pull request #198 from edx/dcs/django-version

Allow XBlocks to be used with django 1.6