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

Conflicts:
	Core/Conf/url.php
	Core/Runtime/Logs/13_06_09.log