Merge remote-tracking branch 'upstream/develop' into triggerMediaScan

-fr/strings.xml

Conflicts:
	src/com/owncloud/android/datamodel/FileDataStorageManager.java
	src/com/owncloud/android/datamodel/OCFile.java

diff --cc owncloud-android-library
index 2799b3e,7ff0bc0..5bd0d73
--- 1/owncloud-android-library
--- 2/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 2799b3e853c79e8ebb37051c92dfcc43f8d63788
 -Subproject commit 7ff0bc0d837edea90b075140f8caba308ce7d378
++Subproject commit 5bd0d7387712ce3f53869294761ac4d8537841cd

diff --cc src/com/owncloud/android/datamodel/FileDataStorageManager.java
Simple merge

diff --cc src/com/owncloud/android/datamodel/OCFile.java
index 6a4ada2,853b01c..70a5154
--- 1/src/com/owncloud/android/datamodel/OCFile.java
--- 2/src/com/owncloud/android/datamodel/OCFile.java
+++ b/src/com/owncloud/android/datamodel/OCFile.java
@@@ -18,18 -18,16 +18,19 @@@
  
  package com.owncloud.android.datamodel;
  
+ import android.os.Parcel;
+ import android.os.Parcelable;
+ import android.webkit.MimeTypeMap;
+ 
+ import com.owncloud.android.lib.common.utils.Log_OC;
+ 
  import java.io.File;
  
 -import third_parties.daveKoeller.AlphanumComparator;
 +import com.owncloud.android.MainApp;
- import com.owncloud.android.lib.common.utils.Log_OC;
  
- import android.os.Parcel;
- import android.os.Parcelable;
- import android.webkit.MimeTypeMap;
- 
 +import third_parties.daveKoeller.AlphanumComparator;
 +import android.content.Intent;
 +import android.net.Uri;
  public class OCFile implements Parcelable, Comparable<OCFile> {
  
      public static final Parcelable.Creator<OCFile> CREATOR = new Parcelable.Creator<OCFile>() {