optimize
Merge branch 'Beta1.2' of https://github.com/lejoying/im into Beta1.2