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 #2189 from dumganhar/master

Synchronizing  cocos2d-js-test to the latest one.
Merge pull request #2191 from dumganhar/master

Fixing wrong display of CCEditbox on retina iOS device.
Merge pull request #2128 from biteforest/Branch_fix_CCScale9Sprite_bug

fix cc scale9 sprite bug
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
fixed #1838: Updating iOS project setting for CocosDragonJS.
Regenerating all resources with the latest CocosBuilder.