Bump to Freemarker 2.3.21.
Merge branch 'develop' of github.com:ninjaframework/ninja into develop

Conflicts:
	ninja-core/src/site/markdown/developer/changelog.md
tiny text change.