Merge pull request #1178 from dingpinglv/Iss2852_RefactorMultResources

Fixed #2852: Corrected a mistake that the sprite can't be display when it was called setColor and cc.Director set ScaleFactor not equal 1.
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