add escapeHtml!!!
images!!! and files!
Merge origin/ardfo into ardfo