Cache: add seccond mtime field
Cache: bookkeeping of storage_mtime
Emulate touch() for backends that don't support it
merge master into filecache_mtime
Merge branch 'master' into filecache_mtime

Conflicts:
	lib/files/view.php
	lib/util.php
	tests/lib/files/cache/cache.php
New hook system
fix typo
Prevent backgroundScan() from looping if opendir() is failing for the same path
Merge branch 'master' into hooks
Merge pull request #3335 from owncloud/prevent-scan-loop

Prevent backgroundScan() from looping
merge master into filecache_mtime
Merge pull request #1586 from owncloud/filecache_mtime

Emulate touch() for backends that don't support it
Merge pull request #3266 from owncloud/hooks

New hook system
Merge branch 'master' into files_encryption

Conflicts:
	lib/files/cache/cache.php