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
Merge pull request #4666 from 2youyouo2/develop

change play interface name