merge master into filesystem

apps/files/admin.php

apps/files/appinfo/routes.php

apps/files/download.php

apps/files/index.php

apps/files/js/publiclistview.php

apps/files/settings.php

apps/files/templates/part.list.php

apps/files_sharing/js/share.js

apps/files_sharing/templates/public.php

config/config.sample.php

core/js/config.php

core/js/update.js

core/templates/update.php

lib/base.php

lib/mail.php

lib/templatelayout.php

lib/user.php