Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
1.add tweenFrame value
2.fix set loop type
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
Merge pull request #3848 from 2youyouo2/master

update armature