11
Merge branch 'master' of https://github.com/wanghexiang/test

Conflicts:
	admin/Lib/Action/LoginAction.class.php
	admin/Runtime/Logs/13_08_06.log
1111