Merge pull request #1295 from dingpinglv/DevelopToMaster

Push developer branch to master branch
Object Index Optimization
Merge remote-tracking branch 'cocos2d/master' into develop
Merge remote-tracking branch 'cocos2d/develop' into develop
Merge pull request #1357 from xbruce/develop

Object Index Optimization
Merge pull request #1358 from SmallAiTT/iss3499_4_npm

issue #3499 : Update for core of the npm branch to work regularly.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into iss3499_4_npm
issue #3499 : Update js path in build.xml.