master configured

Signed-off-by: fei <1450622282@qq.com>
Smoothing user login experience
Merge remote-tracking branch 'origin/fei-login'