Update to Django 1.5.
Merge pull request #342 from benkonrath/django-1.5

Django 1.5