adapt new change
Merge branch 'master' of https://github.com/ShareSDKPlatform/JSSample

Conflicts:
	JSApi/.idea/workspace.xml