Security fix. Html templates did not escape apostrophes properly ('). (ra)
Merge branch 'develop' of github.com:ninjaframework/ninja into develop

Conflicts:
	ninja-core/src/main/java/ninja/template/TemplateEngineFreemarker.java