Merge remote-tracking branch 'origin/master'

Conflicts:
	apps/files_encryption/lib/stream.php

diff --cc apps/files_encryption/lib/stream.php
index 644ac895a8f1c0975eaa4a5a43373fa96a027e31,5a0fb155c313de54d7c4d032a315b461e138ffcf..0ec28e05e53cde40c7e4bef8e3d38cfe91a59ef2
--- 1/apps/files_encryption/lib/stream.php
--- 2/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@@ -328,11 -328,11 +328,19 @@@ class Stream 
  
                }
  
++<<<<<<< HEAD
 +              $util = new Util($this->rootView, $this->userId);
 +
 +              // Fetch and decrypt keyfile
 +              // Fetch existing keyfile
 +              $this->encKeyfile = Keymanager::getFileKey($this->rootView, $util, $this->relPath);
++=======
+               // $util = new Util($this->rootView, $this->userId);
+ 
+               // Fetch and decrypt keyfile
+               // Fetch existing keyfile
+               $this->encKeyfile = Keymanager::getFileKey($this->rootView, $this->util, $this->relPath);
++>>>>>>> origin/master
  
                // If a keyfile already exists
                if ($this->encKeyfile) {