Merge branch 'master' of github.com:owncloud/core into vcategories_db

apps/files/index.php

apps/files/templates/index.php

apps/files_sharing/appinfo/update.php

apps/files_sharing/lib/share/file.php

apps/files_sharing/lib/share/folder.php

apps/files_sharing/lib/sharedstorage.php

apps/files_sharing/public.php

apps/user_ldap/l10n/nl.php

apps/user_webdavauth/l10n/pt_BR.php

l10n/fi_FI/settings.po

l10n/fr/settings.po

l10n/fr/user_webdavauth.po

l10n/nl/user_ldap.po

l10n/pt_BR/settings.po

l10n/pt_BR/user_webdavauth.po

l10n/sv/settings.po

l10n/templates/core.pot

l10n/templates/files.pot

l10n/templates/files_encryption.pot

l10n/templates/files_external.pot