merge branch 1.7.0's changes to trunk.
merge branch 1.7.0's changes to trunk.

git-svn-id: 0a5dd704afd90a8e7d74e1173073bcbd7d9c4106@677 bebf4043-ad85-6e1f-322f-7830e3d0fd93

xpressengine/xe-module-textyle,xpressengine/xe-module-textyle