modify

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

Conflicts:
	src/petcircle/activity/message/OneActivityForMessage.java
Merge branch 'master' of github.com:momoplan/petandroid1
modify
Merge branch 'master' of github.com:momoplan/petandroid1
modify
Merge branch 'master' of github.com:momoplan/petandroid1

Conflicts:
	src/petcircle/activity/circle/CircleSearchActivity.java
	src/petcircle/activity/circle/FriendStatusActivity.java
	src/petcircle/activity/circle/HuatiActivity.java
	src/petcircle/activity/circle/MyReplyActivity.java
	src/petcircle/activity/circle/MyStatusActivity.java