Upgraded to Django 1.7
Merge pull request #1 from ministryofjustice/django-1.7

Upgraded to Django 1.7