添加ADD好友 搜索好友
Merge branch 'master' of https://github.com/momoplan/gameiphone

Conflicts:
	GameGroup/FriendPage/NewFriendPageController.m