* develop:

Conflicts:
	client/views/app/message.coffee

Message type api

Conflicts:
	client/views/app/message.coffee

* develop:
  Fixed conflicts
  added Git Flow and HISTORY.md
  Deletes direct message subscription for users conversing with user being deleted.
  Fix Room model's removeByTypeContainingUsername.  usernames field missing trailing 's'
  Remove the added console log
  Combine the first two checks into one to make it more readable
  Update message pinning to show up on the tab list with a few options to allow/disallow it and whether to allow anyone to pin messages
  Moved oembed code to a template helper.

Conflicts:
	client/views/app/message.coffee

* master:
  Fixed conflicts
  added Git Flow and HISTORY.md
  Remove the added console log
  Combine the first two checks into one to make it more readable
  Update message pinning to show up on the tab list with a few options to allow/disallow it and whether to allow anyone to pin messages
  Moved oembed code to a template helper.

* 'master' of github.com:RocketChat/Rocket.Chat:
  added Git Flow and HISTORY.md

* mitar-move-oembed-to-helper:
  Fixed conflicts
  Moved oembed code to a template helper.

Merge branch 'move-oembed-to-helper' of https://github.com/mitar/Rocket.Chat into mitar-move-oembed-to-helper

# By Mitar
# Via Mitar
* 'move-oembed-to-helper' of https://github.com/mitar/Rocket.Chat:
  Moved oembed code to a template helper.

# Conflicts:
#	client/views/app/message.coffee

Remove direct message subscription for both users when one is deleted

* 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

Add Pinning Functionality

Fixes #1149 where "other" user's subscription for non-deleted, direct message, was not deleted.  This led to duplicate key error if a new user, with the same username as the deleted user, is created and tries to direct message the "other" user.

# 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…