Issue #4580: Fix image format constant inconsistence
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