Merge branch 'master' into movable_apps

diff --cc apps/remoteStorage/auth.php
Simple merge

diff --cc lib/helper.php
index 52278f5c3a23563fc1d98a932fcb48801640190e,eed94917767417d1e5587bdd3713cfd94e5ed040..61a57ec27e3f1b9e644900b3290cd94d013c4209
--- 1/lib/helper.php
--- 2/lib/helper.php
+++ b/lib/helper.php
@@@ -518,17 -521,6 +521,17 @@@ class OC_Helper 
              $counter++;
          }
  
-         return $newname;
+         return $newpath;
      }
 +      
 +      /*
 +       * checks if $sub is a subdirectory of $parent
 +       * 
 +       * @param $sub 
 +       * @param $parent
 +       * @return bool
 +       */
 +      public static function issubdirectory($sub, $parent){
 +              return (substr(realpath($sub), 0, strlen(realpath($parent))) == realpath($parent))?true:false;
 +      }
  }

diff --cc lib/util.php
Simple merge