修改
Merge remote-tracking branch 'toGitHub/master'

Conflicts:
	src/com/gmteam/spiritdata/metadata/relation/service/MetadataService.java
	src/com/gmteam/spiritdata/upload/web/FileUpLoadController.java

Change-Id: I258a2c00a8bd2a1f5ebbb4612245413eebfd455e
mapper