add tamplate tag
Merge branch 't10_template_tag'