Merge pull request #13 from cocos2d/master

Updated with upstream.
Merge pull request #14 from cocos2d/master

Synchronizing to the latest cocos2d-js-test
Merge pull request #15 from cocos2d/master

Updated with upstream.
Merge pull request #16 from cocos2d/master

Updated with upstream.
Merge pull request #20 from cocos2d/master

Updated with upstream.
fixed a bug for getting plist path in CCAnimationCache
Merge pull request #247 from pandamicro/master

Add source map support for ant build in samples
Merge pull request #246 from ShengxiangChen/issue_animationCache

fixed a bug for getting plist path in CCAnimationCache
Merge branch 'master' of https://github.com/shujunqiao/cocos2d-js-tests
modify cocosDenshion(multiresolution is not solved).
Merge pull request #248 from pandamicro/master

Remove boot file from MoonWarriors ant build
Modify CocosDenshionTest.js and tests_resources-jsb.js.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js-tests
Modify tests_resources-jsb.js.
Modify tests_resources-html5.js.
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