Fixed #5489: Make SpriteFrame's initWithTexture function support string parameter as texture
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge pull request #1895 from pandamicro/develop

Fixed #5489: Make SpriteFrame's initWithTexture function support string parameter as texture