Merge remote-tracking branch 'origin/develop' into en.json_fix

.docker/Dockerfile

.sandstorm/sandstorm-pkgdef.capnp

.travis/snap.sh

HISTORY.md

package.json

packages/rocketchat-cors/cors.js

packages/rocketchat-cors/package.js

packages/rocketchat-i18n/i18n/fr.i18n.json

packages/rocketchat-lib/client/lib/cachedCollection.js

packages/rocketchat-lib/rocketchat.info

packages/rocketchat-lib/server/functions/deleteUser.js

packages/rocketchat-lib/server/models/Rooms.js

packages/rocketchat-livechat/.app/client/views/loading.html

packages/rocketchat-livechat/roomType.js

...cketchat-theme/client/imports/components/main-content.css

...-theme/client/imports/components/sidebar/sidebar-item.css

packages/rocketchat-theme/client/imports/general/base.css

...ages/rocketchat-theme/client/imports/general/base_old.css

packages/rocketchat-theme/server/colors.less

packages/rocketchat-ui-account/client/accountPreferences.js