Merge branch 'master' into css-TextProperty
add manager layout property and test file
add FontTest and CustomTest comment
add FontTest other comment
add getFontText()
remove setColor()
modify FontPainter
fix fontPainter color and font size px
fix composing
fix CustomLayoutManager and FontTest
Merge remote-tracking branch 'origin/css-TextProperty' into sample

Conflicts:
	test/html2windows/css/BorderTest.java
	test/html2windows/css/CustomTest.java
	test/html2windows/css/PainterTest.java
merge test code