Signed-off-by: ikphp <ikphp@sina.cn>
Merge branch 'HEAD' of git@github.com:ikphp/joyku.git

Conflicts:
	Core/Runtime/Logs/13_05_30.log

Signed-off-by: ikphp <ikphp@sina.cn>