Merge pull request #3 from cocos2d/master

merge from cocos2d-x
fix CCScale9Sprite bugs when parsing rotated spriteframe from plist file that texture packer generate.
Merge pull request #2128 from biteforest/Branch_fix_CCScale9Sprite_bug

fix cc scale9 sprite bug