change play interface name
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
change std::map to std::unordered_map
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
change comment
fixed armature update
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
change comment
fixed #3517, make CC_USE_PHYSICS can be switch off, and bring Scene::update(float), Scene::addChild(...) out of CC_USE_PHYSICS segment
issue #3517, enable CC_USE_PHYSICS by default
Fix set FPS broken.
Merge pull request #4692 from dumganhar/develop

Fix set FPS broken.
fix black screen when back to foreground  on android.
Merge pull request #4693 from Dhilan007/black_screen_android

fix black screen when back to foreground  on android.
fix compiling error in vs project on win7.
Merge pull request #4695 from Dhilan007/update_vs_project

fix compiling error in vs project on win7.
Some warning fixes on linux.
Add "override"
CCData bugfix
Removes Map<K, V>::capacity(), adds Map<K, V>::bucketCount/bucketSize/bucket methods.