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

packages/rocketchat-api/server/routes.coffee

packages/rocketchat-authorization/server/startup.coffee

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

packages/rocketchat-lib/package.js

...ages/rocketchat-lib/server/methods/cleanChannelHistory.js

packages/rocketchat-lib/server/methods/getChannelHistory.js

packages/rocketchat-lib/server/models/Messages.coffee

...etchat-theme/assets/stylesheets/utils/_colors.import.less

...ketchat-ui-flextab/flex-tab/tabs/uploadedFilesList.coffee

...ocketchat-ui-flextab/flex-tab/tabs/uploadedFilesList.html