Always show <pokemon> tag
Merge remote-tracking branch 'origin/master' into gh-pages