fullPathForFilename is smart enough to handle URLs
Refactor #3985: Fix bug when margin not set in ccs.Margin
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