Fix:Resolve the error that CocoStudioSceneTest load resource in android
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
Fix:Update the file spelling
Merge pull request #4899 from samuele3hu/developNewUI

Fix:Resolve the error that CocoStudioSceneTest load resource in android