ling提交
Merge branch 'master' of https://github.com/liqun2013/fileuploadh5

Conflicts:
	UploadFileTest.v12.suo
	UploadFileTest/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache