Merge branch 'master' into t8_tag
ticket:8 made tag edit_link render a html link instead of just an url
Merge branch 't8_tag'