Merge branch 'master' into sync_full_folder

Conflicts:
	src/com/owncloud/android/providers/FileContentProvider.java

diff --cc src/com/owncloud/android/providers/FileContentProvider.java
Simple merge

diff --cc src/com/owncloud/android/utils/FileStorageUtils.java
index ac39196,d6ebdbd..da1b69e
--- 1/src/com/owncloud/android/utils/FileStorageUtils.java
--- 2/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@@ -50,10 -49,12 +50,10 @@@ public class FileStorageUtils 
      public static final Integer SORT_NAME = 0;
      public static final Integer SORT_DATE = 1;
      public static final Integer SORT_SIZE = 2;
-   
+     public static Integer mSortOrder = SORT_NAME;
+     public static Boolean mSortAscending = true;
+ 
      
 -    //private static final String LOG_TAG = "FileStorageUtils";
 -
      public static final String getSavePath(String accountName) {
          File sdCard = Environment.getExternalStorageDirectory();
          return sdCard.getAbsolutePath() + "/" + MainApp.getDataFolder() + "/" + Uri.encode(accountName, "@");