Trove classifier for Python 3.
Merge remote-tracking branch 'origin/develop' into develop
Make the example project work with 1.6 by using the new style manage.py.
Support django 1.6 by importing from django.conf.urls instead of django.conf.urls.defaults witch was dropped in https://github.com/django/django/commit/59ddb79e9090f8609f9125379db08adc95d507c0
Use a try/except for the new url import path to be backwards compatible with django before 1.6.
Merge remote-tracking branch 'anderspetersson/master' into develop
Whitespace fix
Fixed ImportError when running tests with Django 1.6 trunk.
Added Anders to authors.