login
Merge branch 'master' of github.com:dapianzi/jianzhi

Conflicts:
	App/Lib/Action/Home/MemberAction.class.php