添加文件上传功能
modify gbk to utf8
x修改
ok
Merge branch 'master' into dev

Conflicts:
	src/main/java/upload/action/UploadAction.java
	target/m2e-wtp/web-resources/META-INF/maven/com.cdv.ims.upload/upload/pom.properties
delete m2e-wtp
modify upload by ftp
delete plupload
Merge branch 'dev'