Merge branch 'develop' into mentions-bar

.meteor/packages

.meteor/versions

build.sh

client/startup/startup.coffee

lib/fileUpload.coffee

...hat-authorization/server/functions/addUsersToRoles.coffee

...hat-authorization/server/functions/getRolesForUser.coffee

...tchat-authorization/server/functions/hasPermission.coffee

.../rocketchat-authorization/server/functions/hasRole.coffee

...uthorization/server/functions/removeUsersFromRoles.coffee

...t-authorization/server/methods/addPermissionToRole.coffee

...ketchat-authorization/server/methods/addUserToRole.coffee

...rocketchat-authorization/server/methods/deleteRole.coffee

...horization/server/methods/removeRoleFromPermission.coffee

...at-authorization/server/methods/removeUserFromRole.coffee

...s/rocketchat-authorization/server/methods/saveRole.coffee

packages/rocketchat-authorization/server/publication.coffee

...t-channel-settings/server/methods/saveRoomSettings.coffee

packages/rocketchat-lib/README.md

packages/rocketchat-lib/i18n/en.i18n.json