square view display.
Merge branch 'Beta1.5' of https://github.com/lejoying/im into Beta1.5