merge conflicts ...

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

diff --cc apps/files/js/filelist.js
Simple merge

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

diff --cc apps/files/templates/index.php
Simple merge

diff --cc apps/files/templates/part.list.php
index 6dabd7d697095678bf481c6e870d80a5e52ffa2e,97a9026860bc9ed87d085f1417d3ed247c0cfed6..38d1314392b5ecab84a26bb1ee77675f874cb798
--- 1/apps/files/templates/part.list.php
--- 2/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@@ -1,7 -1,14 +1,15 @@@
  <input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>">
- 
+ <?php $totalfiles = 0;
+ $totaldirs = 0;
+ $totalsize = 0; ?>
  <?php foreach($_['files'] as $file):
 +      $relativePath = substr($file['path'], 6);
+       $totalsize += $file['size'];
+       if ($file['type'] === 'dir') {
+               $totaldirs++;
+       } else {
+               $totalfiles++;
+       }
        $simple_file_size = OCP\simple_file_size($file['size']);
        // the bigger the file, the darker the shade of grey; megabytes*2
        $simple_size_color = intval(160-$file['size']/(1024*1024)*2);

diff --cc apps/files_trashbin/lib/trash.php
Simple merge

diff --cc apps/files_trashbin/templates/part.list.php
Simple merge

diff --cc config/config.sample.php
Simple merge

diff --cc lib/base.php
Simple merge

diff --cc lib/helper.php
Simple merge