Signed-off-by: wanglijun <12ik.wang@gmail.com>
Merge branch 'HEAD' of git@github.com:ikphp/joyku.git

Conflicts:
	Core/Runtime/Cache/space/7a7edb51dbc9f007554a04b06f66e916.php
Signed-off-by: wanglijun <12ik.wang@gmail.com>