t
Merge branch 'master' of https://github.com/solszl/ShrimpUI

Conflicts:
	bin/ShrimpUI.swc
*add extensions Clip
扑棱棱
Merge pull request #1 from yanhuiyeah/master

Merge Pull request from yeah!