Merge branch 'hotfix/smart-content-sort'
updated composer json
removed dom-document
disabled autoescape
Merge branch 'hotfix/dom-document' into develop

Conflicts:
	composer.json