Merge branch 'master' into administration

.meteor/packages

.meteor/versions

client/methods/deleteMessage.coffee

client/methods/updateMessage.coffee

client/views/app/room.coffee

client/views/login/services.coffee

i18n/en.i18n.json

packages/rocketchat-lib/settings/server/startup.coffee

...ages/rocketchat-lib/settings/server/updateServices.coffee

server/configuration/accounts_meld.coffee

server/lib/accounts.coffee

server/methods/deleteMessage.coffee

server/methods/getUsernameSuggestion.coffee

server/methods/updateMessage.coffee