Merge branch 'master' into sync_full_folder

Conflicts:
	owncloud-android-library
	src/com/owncloud/android/files/services/FileUploader.java

diff --cc res/values/strings.xml
Simple merge

diff --cc src/com/owncloud/android/files/FileOperationsHelper.java
Simple merge

diff --cc src/com/owncloud/android/files/services/FileUploader.java
index d6f7127,669ff13..5024da7
--- 1/src/com/owncloud/android/files/services/FileUploader.java
--- 2/src/com/owncloud/android/files/services/FileUploader.java
+++ b/src/com/owncloud/android/files/services/FileUploader.java
@@@ -712,7 -725,7 +712,10 @@@ public class FileUploader extends Servi
          }
          file.setNeedsUpdateThumbnail(true);
          mStorageManager.saveFile(file);
 +        mStorageManager.saveConflict(file, false);
++        
+         mStorageManager.triggerMediaScan(file.getStoragePath());
++
      }
  
      private void updateOCFile(OCFile file, RemoteFile remoteFile) {

diff --cc src/com/owncloud/android/syncadapter/FileSyncAdapter.java
Simple merge

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

diff --cc src/com/owncloud/android/ui/fragment/FileDetailFragment.java
Simple merge

diff --cc src/com/owncloud/android/utils/FileStorageUtils.java
Simple merge