test
Merge branch 'master' of https://github.com/Keksov/HtmlayoutDelphi

Conflicts:
	HtmlCtrl.pas