* master:
  Add Scalingo Deploy button
  Configure LGTM approvals
  New MAINTERRS

* lingohub:
  Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: 'gabriel.engel@gmail.com'.

Conflicts:
	packages/rocketchat-livechat/i18n/en.i18n.json

# By Marcelo Schmidt
# Via Marcelo Schmidt
* 'develop' of github.com:RocketChat/Rocket.Chat:
  Fix #1709 hide mentions for edited messages when keep history is enabled

Update from develop to create version 0.10.0

add trailing slash on ROOT_URL for livechat installation script

needs a slash, else url will look like this:
`j.src = 'https://domain.tldpackages/rocketchat_livechat/assets/rocket-livechat.js';`

Fix pin and star

Fixed several english issues in the Incoming Webhooks settings page

Support Integration webhook calls originating from client browsers

Most modern browser will issue a pre-flight request with HTTP OPTION method before the actual asynchronous POST.    This adds a CORS supporting option endpoint.

[WIP] Livechat manager

Changes to layout and added infinite scroll to mentions bar