Issue #4580: Fix image format constant inconsistence
Fixed #5757: fixed a bug of cc.Scale9Sprite after migrated
Merge pull request #2018 from dingpinglv/Iss5757_Scale9Sprite

Closed #5757: migrate -x Scale9Sprite to CH5
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into Iss5757_Scale9Sprite
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge pull request #2019 from pandamicro/develop

Issue #4580: Fix image format constant inconsistence
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into Iss5757_Scale9Sprite