Merged branch develop into spotlight-tests

.eslintrc

client/startup/unread.js

package.json

packages/rocketchat-api/server/api.js

packages/rocketchat-api/server/settings.js

packages/rocketchat-bot-helpers/server/index.js

...at-channel-settings/client/startup/trackSettingsChange.js

packages/rocketchat-crowd/server/crowd.js

packages/rocketchat-emoji-custom/admin/adminEmoji.js

packages/rocketchat-emoji-custom/admin/emojiEdit.js

packages/rocketchat-emoji-custom/admin/emojiInfo.js

packages/rocketchat-emoji-custom/client/lib/emojiCustom.js

...etchat-emoji-custom/server/methods/insertOrUpdateEmoji.js

...cketchat-emoji-custom/server/methods/uploadEmojiCustom.js

...ages/rocketchat-emoji-custom/server/models/EmojiCustom.js

...ketchat-emoji-custom/server/publications/fullEmojiData.js

...es/rocketchat-emoji-custom/server/startup/emoji-custom.js

packages/rocketchat-emoji-emojione/rocketchat.js

packages/rocketchat-emoji/emojiButton.js

packages/rocketchat-emoji/emojiParser.js