from yoka
Merge branch 'master' of github.com:jimmydong/YEPF

Conflicts:
	core/Cache.class.php