migration from django templates to jinja2/coffin
Merge branch 'jinja'