Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop

.gitignore

.meteor/packages

.meteor/versions

.sandstorm/sandstorm-pkgdef.capnp

example-build.sh

i18n/en.i18n.json

packages/rocketchat-authorization/server/startup.coffee

...-channel-settings-mail-messages/client/lib/startup.coffee

...tings-mail-messages/client/stylesheets/mail-messages.less

...-messages/client/views/channelSettingsMailMessages.coffee

...il-messages/client/views/channelSettingsMailMessages.html

...ail-messages/client/views/mailMessagesInstructions.coffee

...-mail-messages/client/views/mailMessagesInstructions.html

...cketchat-channel-settings-mail-messages/i18n/en.i18n.json

...ages/rocketchat-channel-settings-mail-messages/package.js

...-channel-settings-mail-messages/server/lib/startup.coffee

...settings-mail-messages/server/methods/mailMessages.coffee

...etchat-channel-settings/client/lib/ChannelSettings.coffee

...channel-settings/client/stylesheets/channel-settings.less

...chat-channel-settings/client/views/channelSettings.coffee