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

Conflicts:
	res/layout/hotspot_liet_item.xml
	src/petcircle/activity/circle/HuatiActivity.java
	src/petcircle/activity/circle/adapter/CircleDetailAdapter.java
	src/petcircle/activity/circle/adapter/CircleDetailReplyAdapter.java
	src/petcircle/activity/circle/adapter/HotsPotAdapter.java
updata