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

Conflicts:
	data/runtime/Logs/13_04_18.log
Signed-off-by: ikphp <ikphp@sina.cn>