add png and add CircleDetailActivity.java CircleDetailAdapter.java
update CircleActivity.java HotspotActivity.java HotsPotAdapter.java
Merge branch 'master' of github.com:momoplan/petandroid1

Conflicts:
	res/layout/activity_circle_detail.xml
	src/petcircle/activity/circle/CircleDetailActivity.java
	src/petcircle/activity/circle/HotspotActivity.java
updata
Merge branch 'master' of github.com:momoplan/petandroid1