12.19upd
Merge branch 'Beta1.1' of https://github.com/lejoying/im into Beta1.1