Merge remote-tracking branch 'cocos2d-html5/develop' into issue2039_mainJS

Conflicts:
	samples