Merge branch 'master' into encryption_improved_error_messages_4617

Conflicts:
	apps/files/index.php

diff --cc apps/files/index.php
index b81ba2bdde9ac3daa27a0b48ad595153e800d521,d46d8e32eefcce1cc08cd502a4b016bde1a63418..5ef69a5d35e80d81f97f7180b69cd9a593ea9e82
--- 1/apps/files/index.php
--- 2/apps/files/index.php
+++ b/apps/files/index.php
@@@ -157,6 -132,7 +136,8 @@@ if ($needUpgrade) 
        $tmpl->assign('isPublic', false);
        $tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
        $tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles());
 +      $tmpl->assign("encryptionInitStatus", $encryptionInitStatus);
+       $tmpl->assign('disableSharing', false);
+       $tmpl->assign('ajaxLoad', $ajaxLoad);
        $tmpl->printPage();
  }

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

diff --cc apps/files/templates/index.php
index e17273e47b1dd3e4fb3ecd58cf310cb1d3634992,bd991c3fcb04f0f27df4d50079b82bde457b9716..2e4ca82c62fa97f806c8ca0846ca72785913f8ce
--- 1/apps/files/templates/index.php
--- 2/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@@ -123,4 -116,3 +116,4 @@@
  <input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php p($_['allowZipDownload']); ?>" />
  <input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php p($_['usedSpacePercent']); ?>" />
  <input type="hidden" name="encryptedFiles" id="encryptedFiles" value="<?php $_['encryptedFiles'] ? p('1') : p('0'); ?>" />
- <input type="hidden" name="encryptedFiles" id="encryptionInitStatus" value="<?php p($_['encryptionInitStatus']) ?>" />
++<input type="hidden" name="encryptedFiles" id="encryptionInitStatus" value="<?php p($_['encryptionInitStatus']) ?>" />

diff --cc apps/files_encryption/hooks/hooks.php
Simple merge

diff --cc apps/files_encryption/lib/helper.php
Simple merge

diff --cc apps/files_encryption/lib/stream.php
Simple merge

diff --cc apps/files_encryption/lib/util.php
Simple merge

diff --cc settings/templates/personal.php
Simple merge