Fixed an ampersand that wasn't escaped in html
Merge branch 'master' of github.com:tekton/DocuCanvas