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

diff --combined src/com/owncloud/android/datamodel/FileDataStorageManager.java
index e7895e4,41a5106..b10e525
--- 1/src/com/owncloud/android/datamodel/FileDataStorageManager.java
--- 2/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@@ -300,6 -300,7 +300,7 @@@ public class FileDataStorageManager 
              cv.put(ProviderTableMeta.FILE_PUBLIC_LINK, file.getPublicLink());
              cv.put(ProviderTableMeta.FILE_PERMISSIONS, file.getPermissions());
              cv.put(ProviderTableMeta.FILE_REMOTE_ID, file.getRemoteId());
+             cv.put(ProviderTableMeta.FILE_UPDATE_THUMBNAIL, file.needsUpdateThumbnail());
  
              boolean existsByPath = fileExists(file.getRemotePath());
              if (existsByPath || fileExists(file.getFileId())) {
@@@ -1401,7 -1402,7 +1402,7 @@@
                  path = path + FileUtils.PATH_SEPARATOR;
              }           
  
 -            // Update OCFile with data from share: ShareByLink  ¿and publicLink?
 +            // Update OCFile with data from share: ShareByLink  and publicLink
              OCFile file = getFileByPath(path);
              if (file != null) {
                  if (share.getShareType().equals(ShareType.PUBLIC_LINK)) {