Encode rendered user input
Merge remote-tracking branch 'upstream/master' into encodeHtml

Conflicts:
	node_modules/oae-avocet/myuploads/myuploads.html
Merge pull request #65 from timdegroote/encodeHtml

Encode rendered user input