Merge branch 'develop' of https://github.com/woc2006/cocos2d-x into develop
Merge branch 'develop' of https://github.com/woc2006/cocos2d-x into develop
Merge branch 'develop' of https://github.com/woc2006/cocos2d-x into develop
Merge branch 'develop' of https://github.com/woc2006/cocos2d-x into develop
Merge branch 'develop' of https://github.com/woc2006/cocos2d-x into develop
Merge branch 'develop' of https://github.com/woc2006/cocos2d-x into develop
Merge branch 'develop' of https://github.com/woc2006/cocos2d-x into develop