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

Conflicts:
	Core/Apps/admin/Action/backendAction.class.php
	Core/Runtime/Logs/13_05_27.log