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

Conflicts:
	res/layout/activity_circle_friend_status.xml
	res/layout/activity_circle_search_window.xml
	res/layout/hotspot_liet_item.xml