Upgrade to Django 1.7
Merge pull request #1 from dabapps/django-17

Upgrade to Django 1.7