Merge remote-tracking branch 'origin/add-init_with_name-root_path'

Conflicts:
	TMCache/TMDiskCache.h
Merge remote-tracking branch 'origin/add-read-write-blocks'

Conflicts:
	TMCache/TMDiskCache.m
Merge remote-tracking branch 'origin/add-update_file_modification'