add crop
Merge remote-tracking branch 'upstream/master'
add chat
Merge remote-tracking branch 'upstream/master'