# Conflicts:
#	public_new/js/chat-ui.js
#	public_new/js/chat-websocket.js
#	public_new/js/constant.js
#	public_new/js/share.js