Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
[Cocos2d-JS 3.0 Release] Update build.xml
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Issue #5907: Fix API reference issues
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge pull request #2249 from pandamicro/develop

Issue #5907: Fix API reference issues