ticket:8 Added test for template tag
ticket:8 Added template tag
Merge branch 't8_template_tag'