更新日志:
1.增加了好友列表显示，测试通过。
2.新增了好友按字母顺序排序，测试中
merge
merge2
Merge branch 'master' of https://github.com/wjling/Catherine.git

Conflicts:
	bin/classes/com/app/catherine/R$id.class
	bin/classes/com/app/catherine/R$layout.class
	bin/classes/com/app/catherine/R$menu.class
	bin/classes/com/app/catherine/R$string.class
	bin/classes/com/app/catherine/R$style.class
	bin/classes/com/app/utils/HttpSender$MyThread.class
	bin/classes/com/app/utils/HttpSender.class
	bin/classes/com/app/utils/OperationCode.class
	gen/com/app/catherine/R.java
	src/com/app/utils/HttpSender.java