Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into ...

...issue2261_LoaderBug

Conflicts:
	cocos2d/core/CCLoader.js