Merge remote-tracking branch 'origin/develop' into refresh_folder_contents_when_brows...

diff --cc src/com/owncloud/android/datamodel/FileDataStorageManager.java
index eaeaf98,5f6321d..c60cdac
--- 1/src/com/owncloud/android/datamodel/FileDataStorageManager.java
--- 2/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@@ -678,9 -674,8 +678,8 @@@ public class FileDataStorageManager imp
          
          OCFile file; 
  
 -        while (parentId != 0) {
 +        while (parentId != DataStorageManager.ROOT_PARENT_ID) {
              
-             Log_OC.d(TAG, "parent = " + parentId);
              // Update the size of the parent
              calculateFolderSize(parentId);
              

diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
Simple merge