111111

Signed-off-by: mahaitao <354650951@qq.com>
Merge remote-tracking branch 'origin/new' into new

Conflicts:
	WebContent/register.jsp
	src/com/gmteam/spiritdata/upload/service/FileUploadService.java
	src/com/gmteam/spiritdata/upload/web/FileUpLoadController.java