Merge pull request #250 from shujunqiao/master

Modify cocosDenshionTest.js and add cocosDenshion res.
issue #3349: add ClippingNode for canvas mode
Merge pull request #251 from xingsenma/master

issue #3349: add ClippingNode for canvas mode
Merge pull request #1 from cocos2d/master

Update from remote #1
Closed #3371: modify setPosition and setAnchorPoint's usage for better performance.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js-tests into Iss3371_xxxConst
Issue #3433: replace someNode.setAnchorPoint(cc.p(x,y)) to someNode.setAnchorPoint(x,y)
Issue #3433: replace setContentSize(cc.size(w,h)) to setContentSize(w,h)
Closed #3433: replace setAnchorPoint(cc.p(x,y)) to setAnchorPoint(x,y)
Merge pull request #254 from dingpinglv/Iss3433_RefactorsetContentSize

Closed #3433: replace setAnchorPoint(cc.p(x,y)) to setAnchorPoint(x,y) and replace setContentSize(cc.size(w,h)) to setContentSize(w,h)
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js-tests into Iss3371_xxxConst
issue #3419 update armatureTest to v2.2.2
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js-tests into Cocostudio
Merge pull request #255 from xingsenma/master

issue #3419 update armatureTest to v2.2.2
Closed #3371: replace setPosition(cc.p(x,y)) to setPosition(x,y)
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js-tests into Iss3371_xxxConst
Closed #3371: modify jsloader.js path
Merge pull request #256 from dingpinglv/Iss3371_xxxConst

Closed #3371: modify setPosition and setAnchorPoint's usage for better performance.
Fixed #3371: corrected a mistake.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js-tests into Iss3371_xxxConst