Fixed #2852: Corrected cc.SpriteFrame's mistake for multiple resolution resources.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2852_RefactorMultResources
Merge pull request #1182 from dingpinglv/Iss2852_RefactorMultResources

Iss2852 refactor mult resources