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

Conflicts:
	res/layout/activity_circle.xml
	res/layout/activity_circle_news2.xml
	res/layout/activity_common_user_search.xml
	res/layout/activity_friends_head.xml
	res/layout/activity_nearby.xml
	res/layout/activity_three.xml
	res/layout/contacts_main.xml
	res/layout/finder_nearby_player.xml
	res/layout/gamechat_contacts.xml
	src/com/chatgame/activity/contacts/ContactsActivity.java
	src/com/chatgame/activity/contacts/FriendsActivity.java
	src/com/chatgame/activity/finder/NearByPlayerActivity.java
	src/com/chatgame/activity/finder/SameSevicesPlayerActivity.java