ticket:8 - fix template tag and imports by PEP8
Merge branch 't8_template_tag' to 'master'