merge master into mobile-style

.htaccess

apps/files/appinfo/remote.php

apps/files/css/files.css

apps/files/css/upload.css

apps/files/index.php

apps/files/js/fileactions.js

apps/files/js/filelist.js

apps/files/js/files.js

apps/files/templates/admin.php

apps/files/templates/index.php

apps/files/tests/js/fileactionsSpec.js

apps/files/tests/js/filelistSpec.js

apps/files/tests/js/filesSpec.js

apps/files_encryption/lib/proxy.php

apps/files_encryption/lib/util.php

apps/files_external/3rdparty/phpseclib/AUTHORS

apps/files_external/3rdparty/phpseclib/README.md

apps/files_external/3rdparty/phpseclib/composer.json

...files_external/3rdparty/phpseclib/phpseclib/Crypt/AES.php

...iles_external/3rdparty/phpseclib/phpseclib/Crypt/Base.php