Update to django 1.6
Merge pull request #7 from ff0000/feature/django-16

Update to django 1.6
Merge branch 'master' into develop

* master:
  Update to django 1.6