Upgrade to Django 1.7.
Merge branch 'dev' into 'dev'

Upgrade to django 1.7

You'll need to do a pip install -r and python manage.py migrate after this

See merge request !8