Added some html encoding to Content Generator to try and fix some of the issues of 2768
Merge pull request #154 from goehle/xssfix

Xssfix