Merge remote-tracking branch 'remotes/upstream/descendIntoFolder' into beta

diff --cc src/com/owncloud/android/ui/activity/Uploader.java
index 0194092,4efb8d0..37363e4
--- 1/src/com/owncloud/android/ui/activity/Uploader.java
--- 2/src/com/owncloud/android/ui/activity/Uploader.java
+++ b/src/com/owncloud/android/ui/activity/Uploader.java
@@@ -605,8 -607,13 +605,12 @@@ public class Uploader extends FileActiv
      private void onCreateFolderOperationFinish(CreateFolderOperation operation,
                                                 RemoteOperationResult result) {
          if (result.isSuccess()) {
+             dismissLoadingDialog();
+             String remotePath = operation.getRemotePath().substring(0, operation.getRemotePath().length() -1);
+             String newFolder = remotePath.substring(remotePath.lastIndexOf("/") + 1);
+             mParents.push(newFolder);
              populateDirectoryList();
          } else {
 -            dismissLoadingDialog();
              try {
                  Toast msg = Toast.makeText(this, 
                          ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),