注册
login
Merge branch 'master' of https://github.com/xxxx1997/weike

Conflicts:
	common/config/main-local.php
	frontend/models/WeikeTask.php
	frontend/models/WeikeUser.php
	frontend/runtime/debug/index.data
	frontend/runtime/logs/app.log