modify error in CustomTest
fix conflict
Merge branch 'css-TextProperty' of https://github.com/HtmlToJavaWindowsBuilder/HtmlToJavaWindowsBuilder into css-TextProperty
Merge branch 'css-TextProperty' of github.com:HtmlToJavaWindowsBuilder/HtmlToJavaWindowsBuilder into css-TextProperty