Merge branch 'develop' into refactor_remote_operation_to_create_folder

diff --cc AndroidManifest.xml
Simple merge

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

diff --cc src/com/owncloud/android/files/OwnCloudFileObserver.java
index 47a66b6,964b61c..68c97e4
--- 1/src/com/owncloud/android/files/OwnCloudFileObserver.java
--- 2/src/com/owncloud/android/files/OwnCloudFileObserver.java
+++ b/src/com/owncloud/android/files/OwnCloudFileObserver.java
@@@ -20,16 -20,14 +20,14 @@@ package com.owncloud.android.files
  
  import java.io.File;
  
 -import com.owncloud.android.Log_OC;
  import com.owncloud.android.datamodel.FileDataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
 -import com.owncloud.android.operations.RemoteOperationResult;
 +import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
  import com.owncloud.android.operations.SynchronizeFileOperation;
 -import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 +import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
  import com.owncloud.android.ui.activity.ConflictsResolveActivity;
 +import com.owncloud.android.utils.Log_OC;
  
- 
- 
  import android.accounts.Account;
  import android.content.Context;
  import android.content.Intent;

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