Issue #3501: replace cc.WHITE, cc.RED etc to cc.white(), cc.red()...
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss3501_ReleaseV2.2.2
issue #3419 change setJsonName to setFile for CCComAttribute
Fixed #3568:  Correct a bug that it can't see the progress text when contentScaleFactor sets.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss3568_FixLabelAtlasBug
Merge pull request #1431 from xingsenma/develop

issue #3419 change setJsonName to setFile for CCComAttribute
Merge pull request #1433 from dingpinglv/Iss3568_FixLabelAtlasBug

Fixed #3568: Correct a bug that it can't see the progress text when contentScaleFactor sets.
Merge pull request #1424 from dingpinglv/Iss3501_ReleaseV2.2.2

Issue #3501: replace cc.WHITE, cc.RED etc to cc.white(), cc.red()...
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into develop