Merge branch 'hotfix/0.0.2.3'
Fix XSS vulnerabilities caused by not escaping a users name fields when loading it from JSON. #3948

From a quick look at the for us available databases this was not actually used in the wild.
Merge branch 'hotfix/0.0.2.4' into develop

Conflicts:
	Changelog.md
	app/views/people/show.html.haml
	config/defaults.yml
	spec/helpers/layout_helper_spec.rb