fix the bug of res.json()
Merge remote-tracking branch 'origin/master'
my friends and private messages
Merge remote-tracking branch 'origin/master'