Merge pull request #2 from cocos2d/v2

merge V2
deal the null in string
Merge pull request #7382 from geron-cn/chukongv2

Chukongv2