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

Changed emojis UI; Moved ChatMessages to it’s own file; Fixed emojis
arrow-up bug.

Conflicts:
	server/startup/i18n-validation.coffee

* master:
  added migrations
  Adds a link on login page footer to switch to an alternate language (only available when your default language isn't english)
  Updated utilities:avatar package

Adds a link on login page footer to switch to an alternate language (only available when your default language isn't english)

Removed github request permissions scope (this was requesting full read/write on user info); No scope means read-only.

Fix readme typo

# By Rodrigo Nascimento
# Via Rodrigo Nascimento
* 'master' of github.com:RocketChat/Rocket.Chat:
  Add MarkDown support
  Fix error when Accounts.validateLoginAttempt init with allowed false close #3 #4