# Conflicts:
#	public_new/js/views/collaboration/collaboration.js
#	public_new/js/views/collaboration/share-event-listener.js
#	public_new/js/views/contact/namecard.js