Merge pull request #1 from chukong/master

合并主线Mater
Merge pull request #2 from chukong/master

merge
Merge pull request #3 from chukong/master

合并原版本
Merge pull request #4 from chukong/master

合并版本
Merge pull request #6 from chukong/master

合并原版本
Merge pull request #7 from chukong/master

合并原版
Merge pull request #9 from chukong/master

master
Merge pull request #11 from chukong/master

master
Merge pull request #12 from chukong/master

master
ui里面增加新的外描边方法
Merge pull request #419 from ZhaoTianze/master

为ui.newTTFLabelWithOutline增加新的描边方式