Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5
Fixed #2511 fixed a bug of cc.EditBox and a bug of cc.Scale9Sprite
Merge pull request #1071 from dingpinglv/Iss2511_FixScale9SpriteBug

Fixed #2511 fixed a bug of cc.EditBox and a bug of cc.Scale9Sprite