修改了profile 密码加密
Merge remote-tracking branch 'origin/master'