Merge branch 'develop' into refactor_remote_operation_to_read_folder

Conflicts:
	oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java

diff --cc oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
index 44baf73,12330a9..1d7b485
--- 1/oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
--- 2/oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
+++ b/oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
@@@ -4,7 -4,7 +4,8 @@@ import com.owncloud.android.oc_framewor
  import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
  import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
  import com.owncloud.android.oc_framework.operations.remote.CreateRemoteFolderOperation;
 +import com.owncloud.android.oc_framework.operations.remote.ReadRemoteFileOperation;
+ import com.owncloud.android.oc_framework.operations.remote.RemoveRemoteFileOperation;
  import com.owncloud.android.oc_framework.operations.remote.RenameRemoteFileOperation;
  
  import android.net.Uri;
@@@ -76,18 -76,19 +77,32 @@@ public class TestActivity extends Activ
                return result;
        }
        
-               
+       /** 
+        * Access to the library method to Remove a File or Folder
+        * 
+        * @param remotePath    Remote path of the file or folder in the server.
+        * @return
+        */
+       public RemoteOperationResult removeFile(String remotePath) {
+               
+               RemoveRemoteFileOperation removeOperation = new RemoveRemoteFileOperation(remotePath);
+               RemoteOperationResult result = removeOperation.execute(mClient);
+               
+               return result;
+       }
+       
 +      /**
 +       * Access to the library method to Read a File or Folder (PROPFIND DEPTH 1)
 +       * @param remotePath
 +       * 
 +       * @return
 +       */
 +      public RemoteOperationResult readFile(String remotePath) {
 +              
 +              ReadRemoteFileOperation readOperation= new ReadRemoteFileOperation(remotePath);
 +              RemoteOperationResult result = readOperation.execute(mClient);
++
 +              return result;
 +      }
        
  }