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
[master] Fixing a compilation error for Mac port after merging WIN8 RT & WIN PHONE8.
Merge pull request #3849 from dumganhar/master

[master] Fixing a compilation error for Mac port after merging WIN8 RT &WIN PHONE8 codes.
[master] Removing unused variable, otherwise, it will trigger compilation error on linux.
Merge pull request #3850 from dumganhar/master

[master] Removing unused variable, otherwise, it will trigger compilation error on linux.
Merge pull request #3848 from 2youyouo2/master

update armature