resolve merge

README.md

package.json

packages/rocketchat-api/package.js

packages/rocketchat-api/server/default/metrics.js

...hat-integrations/client/views/integrationsIncoming.coffee

packages/rocketchat-integrations/server/api/api.coffee

packages/rocketchat-lib/.npm/package/npm-shrinkwrap.json

packages/rocketchat-lib/package.js

packages/rocketchat-lib/server/lib/metrics.js

packages/rocketchat-lib/server/methods/sendMessage.coffee

packages/rocketchat-lib/server/models/_BaseCache.js

packages/rocketchat-theme/client/imports/base.less

packages/rocketchat-ui/lib/notification.coffee

packages/rocketchat-ui/views/app/room.coffee

packages/rocketchat-ui/views/app/room.html

server/startup/migrations/v082.js