issue #3419 add ".ExportJson" to cc.RESOURCE_TYPE
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into develop_20131218
issue #3419 support read pageView and listView
issue #3419 add Trigger for cocostudio
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into develop_20131218
issue #3419 fix a bug of listView that it read wrong
Fixed #1395: Correct a mistake for issue 1395
Merge pull request #1399 from dingpinglv/Iss1395_FixScale9SpriteBug

Fixed #1395: Correct a mistake for issue 1395
Fixed #3499: modify some codes for NPM
Merge pull request #1400 from dingpinglv/Iss3499_ModifyForNPM

Fixed #3499: modify some codes for NPM
issue #3419 fix a bug of UITextField that setText is wrong work when enabled password
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into develop_20131218
Merge pull request #1402 from xingsenma/develop_20131218

issue #3419 add Trigger for cocostudio
issue #3510 Javascript compress
Merge pull request #1411 from xingsenma/develop

issue #3510 Javascript compress
issue #3419 change changeDisplayByIndex to changeDisplayWithIndex
issue #3419 change changeDisplayByName to changeDisplayWithName
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
Fixed #3569: Use viewport to clearRect, limit Canvas size for FixedWidth and FixedHeight mode