Conflicts:
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/files_encryption.pot
	l10n/templates/files_external.pot
	l10n/templates/files_sharing.pot
	l10n/templates/files_versions.pot
	l10n/templates/lib.pot
	l10n/templates/settings.pot
	l10n/templates/user_ldap.pot
	l10n/templates/user_webdavauth.pot

Replace %2F with / in breadcrumbs

Fall back to default log file if logfile config file not found, suppress writing errors, fixes issue #826

Storage wording

Try to fix #836

THX @VicDeo

fix logout icon, hopefully also #969

ignore autogenerated testfiles and folders

Files styles

within the user administratio page some translations have been missing

setting the timezone is now part of the login process 

Trigger the last action before continuing with a file upload

Migration of build files from Jenkins