Fix XSS vulnerabilities

Added htmlEncode to a parameter in a template missed before.
Merge remote-tracking branch 'origin/master' into ecollab.eu