添加**修改
Merge branch 'master' of https://github.com/shenxingfu/FriendsCircle

Conflicts:
	src/com/example/friendscircle/MyListView.java