Add tags to Markdown template
Merge commit '671cbacbdd538540527932b86b44c9d7ab5d1e02' into gh-pages