Conflicts:
	lib/private/app.php
	settings/templates/apps.php

Don't update the mtime if the storage mtime hasn't changed

Fixed quota wrapper to return the value from flock()

Dont overwrite OCA.Sharing

table files_trashsizes was still used in some locations -> removed

Use the permissions exposed by ownCloud for webdav external storages

use slide toggle for files app

Added switch to count external storage data in quota

Added Shared with link sidebar section in files app

remove file locking - code will continue to live in it's own app

Toggle app navigation not only on mobile, but on desktop as well

Fix mime type returning for shared with others files

Simulate apps database schema update on upgrade

Kill permissions table

- the file/folder's permission is now stored in the file cache
- BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs
- increase version to trigger database migration

remove obsolete placeholder call, fix #8881

Update SabreDAV to 1.8.10

This prevents routes like "core/js/oc.js" to automatically load apps and
trigger their update prematurely.

minimal mail template editor for administrators

[versioning] let the file cache track the size of the versions

personal settings: unbold clients header and remove obsolete CSS