Merge branch 'master' into chende
。
。
Merge branch 'chenyan'
从外网得到注册用户管理
Merge branch 'master' into chende