update code
update code
update code
Merge branch 'media_recorder'
Merge branch 'master' of https://github.com/BinGoBinBin/IMChat