Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
add support for tweenRotate property
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
change const char* to const std::string&
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
change std::string compare method
fixed getFileData
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
change std::string.compare() to ==
Merge pull request #4614 from 2youyouo2/develop

update armature, using `const std::string&` instead of `const char*`