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