Merge branch 'change_cachedisk'

Conflicts:
	src/jp/ac/titech/cs/de/ykstorage/cli/SimpleClient2.java
	src/jp/ac/titech/cs/de/ykstorage/service/StorageManager.java
	src/jp/ac/titech/cs/de/ykstorage/service/cmm/CacheMemoryManager.java