Merge pull request #1 from cocos2d/develop

Merging updates from base.
fullPathForFilename is smart enough to handle URLs
fixed #2261: support path format
fixed #2261: support path format
fixed #2261: Preload resource with queuing
Merge pull request #1558 from pandamicro/develop

Refactor #3985: Fix bug when margin not set in ccs.Margin
Merge pull request #1557 from NatWeiss/patch-3

fullPathForFilename is smart enough to handle URLs
extraction public function
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into issue2261_LoaderBug
Merge pull request #1560 from ShengxiangChen/issue_callback

extraction public function
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into issue2261_LoaderBug

Conflicts:
	cocos2d/core/CCLoader.js
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into issue2261_LoaderBug

Conflicts:
	cocos2d/core/CCLoader.js
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into issue2261_LoaderBug

Conflicts:
	cocos2d/core/CCLoader.js
Merge pull request #1559 from ShengxiangChen/issue2261_LoaderBug

fixed #2261: support path format
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into issue2261_LoaderBug

Conflicts:
	cocos2d/core/CCLoader.js
Closed #4051: cc.TMXLayer.removeChild's bug has been fixed.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss4051_FixTMXLayerRemoveChild
Merge pull request #1563 from dingpinglv/Iss4051_FixTMXLayerRemoveChild

Closed #4051: cc.TMXLayer.removeChild's bug has been fixed.
Merge pull request #1562 from ShengxiangChen/issue2261_LoaderBug

Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into ...
issue #1565 bug in CCSAXParser.js