Merge branch 'master' of https://github.com/yrizos/cache

Conflicts:
	library/Cache/Filesystem.php