[ci skip]
Merge pull request #19 from cocos2d/develop

[ci skip]