fixed #2852: Corrected a SpriteFrameCache's mistake for adapting multiple resolution resources
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2852_RefactorMultResources
Merge pull request #1180 from dingpinglv/Iss2852_RefactorMultResources

fixed #2852: Corrected a SpriteFrameCache's mistake for adapting multiple resolution resources