fixed feed issues with unescaped html
Merge branch 'master' into usercardfix