noosfero | Merge branch 'html-escape-fixes' into 'master' (!1046)

[Rodrigo Souto]

New Merge Request !1046

https://gitlab.com/noosfero/noosfero/merge_requests/1046

Branches: cherry-pick-8be6cb6d to stable-1.6
Author:    Rodrigo Souto
Assignee:  Rodrigo Souto

Html escape fixes

See merge request !1042

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20161118/07804913/attachment.html>