完成个性签名和生活照设置
fix a bug
Merge branch 'zqy'
merge from zqy