11-3上午
Merge remote-tracking branch 'origin/new' into new

Conflicts:
	src/com/gmteam/spiritdata/upload/service/FileUploadService.java