merge fix

diff --cc src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java
Simple merge

diff --cc src/eu/alefzero/owncloud/datamodel/OCFile.java
index b087a9d,9566a19..336f95c
--- 1/src/eu/alefzero/owncloud/datamodel/OCFile.java
--- 2/src/eu/alefzero/owncloud/datamodel/OCFile.java
+++ b/src/eu/alefzero/owncloud/datamodel/OCFile.java
@@@ -322,15 -322,18 +322,27 @@@ public class OCFile implements Parcelab
      }
  
      @Override
 -    
 -    
 +    public int compareTo(OCFile another) {
 +        if (isDirectory() && another.isDirectory()) {
 +            return getFileName().toLowerCase().compareTo(another.getFileName().toLowerCase());
 +        } else if (isDirectory()) {
 +            return -1;
 +        } else if (another.isDirectory()) {
 +            return 1;
 +        }
 +        return getFileName().toLowerCase().compareTo(another.getFileName().toLowerCase());
 +    }
 +
+     public boolean equals(Object o) {
+         OCFile that = (OCFile) o;
+         return this.mId == that.mId;
+     }
+ 
+     @Override
+     public String toString() {
+         String asString = "[id=%s, name=%s, mime=%s, downloaded=%s, local=%s, remote=%s]";
+         asString = String.format(asString, new Long(mId), getFileName(), mMimeType, isDownloaded(), mLocalPath, mRemotePath);
+         return asString;
+     }
+ 
  }