# Conflicts:
#	public_new/archive_detail.html
#	public_new/chat_add_user.html
#	public_new/chat_room.html
#	public_new/collaboration.html
#	public_new/footer_collabo.html
#	public_new/js/archive.js
#	public_new/js/chat-ui.js
#	public_new/modal_chat_menu.html
#	public_new/modal_collabo_profile.html
#	public_new/template/template_open_collaboration_message.html
#	public_new/template/template_user_name_card.html