Merge branch 'master' of https://github.com/bfeng/FusionFS-Cache

Conflicts:
	doc/texs/evaluation.tex
lose