* message-type-api:
  Created RocketChat.MessageTypes class to hold message type rendering rules
  Removed unused 'nu' message type
  Send e-mail on first username set
  Add enrollment email

# Via Marcelo Schmidt (2) and Gabriel Engel (1)
* 'master' of github.com:RocketChat/Rocket.Chat:
  Send e-mail on first username set
  Add enrollment email

Enrollment email

* 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

Rocket mailer

* master: (24 commits)
  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
  added back _colors files
  livechat route
  fixing livechat route
  ...

Silly.. I know.

Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: 'gabr…

Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: 'gabr…

Created and pushed by LingoHub.

Missing features from livechat

* master: (28 commits)
  preventDefault on shift + esc shortcut
  Close #1222; Fix shared variable with username info when generate avatar
  Merging .travis.yml
  meteor update
  Updating meteor
  Applying velocity-cli for application test in CI mode
  Add add ons per #1045
  New attempt for application test.
  Test attempt.
  Added application tests
  Final updated versions
  Updating versions
  Explicitly declaring sanjo:jasmine version.
  Simplifying rocketchat:markdown tests since its falling because of underscore.string
  Fixing call to underscore.string 'trim' method to avoid conflicts with Underscore test stubs.
  Fixed path for velocity-cli execution
  Added correct velocity-cli package
  Setting up Travis CI for test execution and removing test dependencies
  Updating to support ServiceConfiguration.configurations stub method (meteor-velocity/meteor-stubs/#11)
  Settings file should only be available on server.
  ...