Update to Django 1.6
Merge pull request #1001 from ostcar/django1.6

Update to Django 1.6