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
Add Big TileMap test case
Revert "Add Big TileMap test case"

This reverts commit 282c7617f19b913ac25d332cdc3e3e933168e338.
Add source map support to ant build
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
Remove boot file from MoonWarriors ant build
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.