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

Conflicts:
	res/layout/contacts_search_friend_by_id.xml
	src/com/chatgame/activity/contacts/SearchFriendByIdActivity.java
	src/com/chatgame/utils/common/PublicMethod.java