# Conflicts:
#	packages/rocketchat-channel-settings/client/startup/tabBar.coffee
#	packages/rocketchat-lib/server/startup/settings.coffee
#	packages/rocketchat-theme/client/imports/base.less
#	packages/rocketchat-ui-login/client/login/form.coffee
#	packages/rocketchat-ui-master/master/main.coffee
#	packages/rocketchat-ui-message/client/messageBox.coffee
#	packages/rocketchat-ui-message/message/messageBox.html
#	packages/rocketchat-ui-sidenav/client/accountBox.coffee
#	packages/rocketchat-ui-sidenav/client/chatRoomItem.coffee
#	packages/rocketchat-ui-sidenav/package.js
#	packages/rocketchat-ui/lib/collections.coffee
#	server/publications/spotlight.js