FIX: error templatetag name
Merge branch 'master' of github.com:perchouli/erya