Merge branch 'refactor_remote_operation_to_create_folder' into refactor_remote_operat...

Conflicts:
	oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java

diff --cc oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java
index b11c608,f25c22e..5ee07d7
--- 1/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java
--- 2/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java
+++ b/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java
@@@ -54,7 -56,7 +56,11 @@@ public class CreateRemoteFolderOperatio
          RemoteOperationResult result = null;
          MkColMethod mkcol = null;
          
++<<<<<<< HEAD
 +        boolean noInvalidChars = FileUtils.validateName(mRemotePath, true);
++=======
+         boolean noInvalidChars = FileUtils.validateName(mFolderName);
++>>>>>>> refactor_remote_operation_to_create_folder
          if (noInvalidChars) {
                try {
                        mkcol = new MkColMethod(client.getBaseUri() + WebdavUtils.encodePath(mRemotePath));