typo
Merge branch 'Beta1.5' of https://github.com/lejoying/im into Beta1.5

Conflicts:
	androidApp/src/com/open/welinks/controller/SquareSubController.java
Merge branch 'Beta1.5' of https://github.com/lejoying/im into Beta1.5
Merge branch 'Beta1.5' of https://github.com/lejoying/im into Beta1.5
added searchFriendActivity and fixed bugs
Merge branch 'Beta1.5' of https://github.com/lejoying/im into Beta1.5