merge master into input-simplify

apps/files/css/files.css

apps/files/css/upload.css

apps/files/index.php

apps/files/js/filelist.js

apps/files/js/files.js

apps/files/templates/index.php

apps/files_encryption/ajax/updatePrivateKeyPassword.php

apps/files_encryption/appinfo/app.php

apps/files_encryption/appinfo/version

apps/files_encryption/files/error.php

apps/files_encryption/hooks/hooks.php

apps/files_encryption/js/settings-admin.js

apps/files_encryption/lib/helper.php

apps/files_encryption/lib/session.php

apps/files_encryption/lib/stream.php

apps/files_encryption/lib/util.php

apps/files_encryption/settings-personal.php

apps/files_encryption/templates/invalid_private_key.php

apps/files_encryption/templates/settings-admin.php

apps/files_encryption/templates/settings-personal.php