merge master into navigation

diff --cc apps/files/css/files.css
Simple merge

diff --cc apps/files/templates/part.breadcrumb.php
index 876cd19bc1343fe5c555ebc0a05d72dc089026c4,7df2afc1f52ea6b8ef1c0f2f3b9495b418663c53..87442606b00e029b86b6486c7f9e5de2315f86b1
--- 1/apps/files/templates/part.breadcrumb.php
--- 2/apps/files/templates/part.breadcrumb.php
+++ b/apps/files/templates/part.breadcrumb.php
@@@ -1,16 -1,10 +1,17 @@@
-       <?php if(count($_["breadcrumb"])):?>
++<?php if(count($_["breadcrumb"])):?>
 +      <div class="crumb">
 +              <a href="<?php echo $_['baseURL'].urlencode($crumb['dir']); ?>">
 +                      <img src="<?php echo OCP\image_path('core','places/home.svg');?>" />
 +              </a>
 +      </div>
-       <?php endif;?>
-       <?php for($i=0; $i<count($_["breadcrumb"]); $i++):
++<?php endif;?>
+ <?php for($i=0; $i<count($_["breadcrumb"]); $i++):
        $crumb = $_["breadcrumb"][$i];
-       $dir = str_replace('+', '%20', urlencode($crumb["dir"])); ?>
-               <div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg"
-                        data-dir='<?php echo $dir;?>'
-                        style='background-image:url("<?php echo OCP\image_path('core', 'breadcrumb.png');?>")'>
-               <a href="<?php echo $_['baseURL'].$dir; ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
-               </div>
-       <?php endfor;
+       $dir = str_replace('+', '%20', urlencode($crumb["dir"]));
+       $dir = str_replace('%2F', '/', $dir); ?>
+       <div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg"
+                data-dir='<?php echo $dir;?>'
+                style='background-image:url("<?php echo OCP\image_path('core', 'breadcrumb.png');?>")'>
+       <a href="<?php echo $_['baseURL'].$dir; ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
+       </div>
 -<?php endfor;
++<?php endfor;

diff --cc core/css/styles.css
Simple merge

diff --cc core/js/js.js
Simple merge