准备移入多语言支持
Merge branch 'master' of github.com:SLboat/ClipUpload

Conflicts:
	ClipUpload.php