current django templates
Merge pull request #1 from dannypernik/django-dev

current django templates