Change to lock pattern for TMDiskCache
Merge branch 'changeToLockPattern'

Conflicts:
	TMCache/TMMemoryCache.m