HTML and JS escaping in Freemarker templates
Move HTML escaped chars to freemarker
Update freemarker 2.3.18 --> 2.3.21 (enable json_string)
Merge branch 'master' of https://github.com/molgenis/molgenis
Move HTML escaped chars to freemarker
Merge pull request #2193 from dennishendriksen/master

html and js escaping in freemarker templates
Fix unit tests
Merge pull request #2195 from dennishendriksen/master

Fix unit tests
Merge branch 'master' of github.com:molgenis/molgenis into feature/create-copy