Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop

.meteor/packages

.meteor/versions

i18n/en.i18n.json

packages/rocketchat-authorization/server/startup.coffee

...ages/rocketchat-lib/server/methods/addOAuthService.coffee

.../rocketchat-lib/server/startup/oAuthServicesUpdate.coffee

packages/rocketchat-oauth2-server-config/.gitignore

...tchat-oauth2-server-config/admin/client/collection.coffee

...rocketchat-oauth2-server-config/admin/client/route.coffee

...cketchat-oauth2-server-config/admin/client/startup.coffee

...t-oauth2-server-config/admin/client/views/oauthApp.coffee

...hat-oauth2-server-config/admin/client/views/oauthApp.html

...-oauth2-server-config/admin/client/views/oauthApps.coffee

...at-oauth2-server-config/admin/client/views/oauthApps.html

...th2-server-config/admin/server/methods/addOAuthApp.coffee

...-server-config/admin/server/methods/deleteOAuthApp.coffee

...-server-config/admin/server/methods/updateOAuthApp.coffee

...-server-config/admin/server/publications/oauthApps.coffee

...at-oauth2-server-config/oauth/client/oauth2-client.coffee

...chat-oauth2-server-config/oauth/client/oauth2-client.html