Merge branch 'master' into fileinfo

3rdparty

apps/files/js/filelist.js

apps/files/templates/part.breadcrumb.php

apps/files_encryption/appinfo/info.xml

apps/files_encryption/lib/proxy.php

apps/files_external/js/dropbox.js

apps/files_external/js/google.js

apps/files_external/js/settings.js

apps/files_external/lib/webdav.php

apps/files_sharing/public.php

apps/files_trashbin/lib/trashbin.php

apps/files_versions/lib/versions.php

apps/user_ldap/lib/connection.php

apps/user_ldap/lib/wizard.php

core/css/fixes.css

core/css/styles.css

core/js/setup.js

core/setup.php

core/templates/installation.php

lib/private/api.php