fixed playByIndex lack param
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
fixed frame event emit twice times
Modify the android project configuration of JS template.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge pull request #5504 from 2youyouo2/master

update armature
Merge pull request #5514 from natural-law/master

Modify the android project configuration of JS template.
Merge pull request #5497 from nutty898/master_nutty_modify_framework_for315

Master nutty modify framework for315
Merge branch 'master' into master_nutty_modify_framework_for315