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
issue #3499 : Update for core of the npm branch to work regularly.
issue #3499 : Change the path for CCLabelTTF and CCActionManager in jsloader.
Merge pull request #1358 from SmallAiTT/iss3499_4_npm

issue #3499 : Update for core of the npm branch to work regularly.
issue #3499 : Change the path for CCLabelTTF and CCActionManager in build.xml.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into iss3499_4_npm
issue #3499 : Update js path in build.xml.
Merge pull request #1359 from SmallAiTT/iss3499_4_npm

issue #3499 : Change the path for CCLabelTTF and CCActionManager in buil...
Fixed #3499: modify build.xml for NPM
Merge pull request #1362 from dingpinglv/Iss3499_ForNPM

Fixed #3499: modify build.xml for NPM
Fixed #3499: delete invalid ActionManager in build.xml
Merge pull request #1363 from dingpinglv/Iss3499_ForNPM

Fixed #3499: delete invalid ActionManager in build.xml
issue #3499 : Add a function to set the root of path for audio resources.
Merge pull request #1364 from SmallAiTT/iss3499_4_npm

issue #3499 : Add a function to set the root of path for audio resources...
Merge pull request #8 from cocos2d/develop

Merge from trunk