To optimize the ChatActivity
Merge branch 'Beta1.5' of https://github.com/lejoying/im into Beta1.5

Conflicts:
	androidApp/src/com/open/welinks/controller/FriendsSubController.java
	androidApp/src/com/open/welinks/controller/MessagesSubController.java
Merge branch 'Beta1.5' of https://github.com/lejoying/im into Beta1.5

Conflicts:
	androidApp/src/com/open/welinks/controller/FriendsSubController.java