Merge branch 'master' into channel-settings

* master: (409 commits)
  Changes to rocketmailer allows any from address.
  Add default allowed file upload
  Fix #1381
  add SECURITY.md
  Using official emojione package
  Using official emojione package
  3,000 commits!!
  Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: 'gabriel.engel@gmail.com'.
  try new guest count every loop
  sorting i18n strings
  Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: 'gabriel.engel@gmail.com'.
  use correct settings for livechat app
  Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: 'gabriel.engel@gmail.com'.
  meteor update
  update old build script
  there is no message to update yet
  livechat room publish
  room icons
  RocketMailer and Unsubscription
  preventDefault on shift + esc shortcut
  ...

Conflicts:
	.meteor/packages
	.meteor/versions