修改好友列表搜索
修改完毕
Merge branch 'master' of https://github.com/zhjnuacm/sigma-platform

Conflicts:
	client/src/common/ChatPanel.js
	client/src/common/FriendList.js
	client/src/common/InputPanel.js
	client/src/common/TextBox.js
	client/src/common/TipBox.js
	client/src/common/Tools.js

	modified:   assets/420242b7/jui/js/jquery-ui-i18n.min.js
	modified:   client/src/common/ChatPanel.js
	modified:   client/src/common/FriendList.js
	modified:   client/src/common/InputPanel.js
	modified:   client/src/common/TipBox.js
	modified:   client/src/common/Tools.js
	modified:   client/src/common/ViewPanel.js
	modified:   client/src/core/ChildScene.js
	modified:   client/src/core/Map.js
	modified:   client/src/core/Mediator.js
	modified:   client/src/core/UserContral.js
	modified:   protected/controllers/UserFriendController.php