Fix XSS issue in poll questions

closes #5274
Merge branch 'hotfix/0.4.1.1'
Merge branch 'master' of git://github.com/diaspora/diaspora