upgrade to Django 1.7
Merge pull request #1 from johanneswilm/develop

upgrade to Django 1.7