Merge pull request #2193 from dennishendriksen/master

html and js escaping in freemarker templates