fix loading bug
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae

Conflicts:
	cocos2d-html5/.idea/workspace.xml