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

Conflicts:
	res/layout/nearby_listview_item.xml
	src/petcircle/activity/nearbyPeople/ThreeActivityForAround.java
	src/petcircle/adapter/ThreeListViewAdapter.java
	src/petcircle/adapter/UserInfoListAdapter.java