use django-template-finder instead of our own function
Merge branch 'template-finder'

* template-finder:
  use django-template-finder instead of our own function