Merge branch 'spring-data-rest' of

https://CazUniGE@bitbucket.org/dlcmdev/dlcm-backend.git into
spring-data-rest

Conflicts:
	DLCM-PreIngest/src/main/java/ch/dlcm/model/Deposit.java

DLCM-PreIngest/src/main/java/ch/dlcm/model/Deposit.java

@@ -85,24 +85,15 @@ public class Deposit extends RESTResource {
 	public List<DataFile> getDataFiles() {
 		return dataFiles;
 	}
-<<<<<<< HEAD
+
 	public void setDataFiles(List<DataFile> files){
 	    this.dataFiles = files;
-=======
-	public void setFiles(List<File> files){
-	    this.files = files;
 	    updateTime();
->>>>>>> branch 'spring-data-rest' of https://CazUniGE@bitbucket.org/dlcmdev/dlcm-backend.git
 	}
 
-<<<<<<< HEAD
 	public void addDataFile(DataFile f) {
 		this.dataFiles.add(f);
-=======
-	public void addFile(File f) {
-		this.files.add(f);
 		updateTime();
->>>>>>> branch 'spring-data-rest' of https://CazUniGE@bitbucket.org/dlcmdev/dlcm-backend.git
 	}
 
 	public String getSip() {