update
Merge branch 'master' of https://github.com/cxjwin/CoreTextDemo_cxjwin

Conflicts:

CoreTextDemo.xcodeproj/project.xcworkspace/xcuserdata/cxjwin.xcuserdatad
/UserInterfaceState.xcuserstate
	TEST_ATTR_002/CoreTextView.m