Update django to 1.6
Merge pull request #14 from HelloLily/feature/django-update

Feature/django update to 1.6