config
Merge branch 'Admin' of https://github.com/denghongcai/TZB-Weixin into Admin
Merge branch 'Admin' of https://github.com/denghongcai/TZB-Weixin into Admin
Merge branch 'Admin' of https://github.com/denghongcai/TZB-Weixin into Admin
Merge branch 'Admin' of https://github.com/denghongcai/TZB-Weixin into Admin

Conflicts:
	application/models/user_model.php