Merge branch 'master' into decrypt_files_again

Conflicts:
	apps/files_encryption/tests/keymanager.php

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

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

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

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/util.php
Simple merge

diff --cc apps/files_encryption/tests/crypt.php
Simple merge

diff --cc apps/files_encryption/tests/keymanager.php
Simple merge

diff --cc apps/files_encryption/tests/share.php
Simple merge

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

diff --cc lib/util.php
Simple merge

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