Merge remote-tracking branch 'origin/master'

Conflicts:
	apps/files_encryption/lib/stream.php

apps/files/css/files.css

@@ -556,6 +556,12 @@ table tr.summary td {
 
 #scanning-message{ top:40%; left:40%; position:absolute; display:none; }
 
+#emptycontent .icon-starred {
+	height: 30px;
+	width: 30px;
+	margin: 0 auto 10px;
+}
+
 table.dragshadow {
 	width:auto;
 }

apps/files/css/mobile.css

@@ -24,7 +24,7 @@ table td {
 }
 /* and accordingly fix left margin of file list summary on mobile */
 .summary .info {
-	margin-left: 55px;
+	margin-left: 105px;
 }
 
 /* remove shift for multiselect bar to account for missing navigation */

apps/files/index.php

@@ -93,7 +93,7 @@ function sortNavigationItems($item1, $item2) {
 		'id' => 'favorites',
 		'appname' => 'files',
 		'script' => 'simplelist.php',
-		'order' => 50,
+		'order' => 5,
 		'name' => $l->t('Favorites')
 	)
 );

apps/files/templates/simplelist.php

@@ -3,7 +3,10 @@
 </div>
 <div id='notification'></div>
 
-<div id="emptycontent" class="hidden"></div>
+<div id="emptycontent" class="hidden">
+	<div class="icon-starred"></div>
+	<?php p($l->t('Files and folders you mark as favorites will show up here')); ?>
+</div>
 
 <input type="hidden" name="dir" value="" id="dir">
 

apps/files_encryption/lib/stream.php

@@ -328,16 +328,24 @@ 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) {
 
-			$shareKey = Keymanager::getShareKey($this->rootView, $this->keyId, $util, $this->relPath);
+			$shareKey = Keymanager::getShareKey($this->rootView, $this->keyId, $this->util, $this->relPath);
 
 			// if there is no valid private key return false
 			if ($this->privateKey === false) {