Added htmlContent
qMerge branch 'master' of https://github.com/minowak/tuaw-ed