Altered the escaping of String in HTML content.

We now escape the String content if it is *not* HTML. If it is HTML content, we assume that the content is valid HTML and that the caller has already escaped the bits that need escaping. This prevents the escaping of HTML tags.
Added code to escape "'" before JS output.