update subModule
Merge branch 'master' of https://github.com/xingsenma/cocos2d-html5

Conflicts:
	cocos2d/CCLoader.js
	cocos2d/sprite_nodes/CCSprite.js