Closed #3568: Fix a bug of LabelAtlas that it doesn't work when contentScaleFactor sets.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss3568_FixLabelAtlasBug
Merge pull request #1414 from dingpinglv/Iss3568_FixLabelAtlasBug

Closed #3568: Fixed a bug of LabelAtlas that it doesn't work when contentScaleFactor sets.
Merge pull request #1413 from pandamicro/develop

Fixed #3569: Use viewport to clearRect
Merge pull request #1415 from pandamicro/develop

Refactor #3370: Reverse change to FixedWidth and FixedHeight policy
Issue #3501: update build.xml for jsDoc
Merge pull request #1418 from dingpinglv/Iss3501_ReleaseV2.2.2

Issue #3501: update build.xml for jsDoc
Refactor #3370: Window adaptation fixed for Mi 2
Fixed #3569: Y axe correction for clear rect