update
Merge branch 'master' of github.com:momoplan/petandroid1

Conflicts:
	res/layout/activity_circle_friend_detail.xml
	src/petcircle/activity/circle/FriendDetailActivity.java
	src/petcircle/activity/circle/FriendStatusActivity.java
	src/petcircle/activity/circle/adapter/FriendDetailAdapter.java
	src/petcircle/activity/circle/adapter/FriendStatusAdapter.java
update
Merge branch 'master' of github.com:momoplan/petandroid1