Merge pull request #2236 from Johann-Snapp/develop

.meteor/packages

.meteor/versions

i18n/en.i18n.json

i18n/fr.i18n.json

packages/rocketchat-highlight-words/client.coffee

packages/rocketchat-highlight-words/package.js

packages/rocketchat-lib/server/lib/notifyUsersOnMessage.js

...s/rocketchat-lib/server/lib/sendNotificationsOnMessage.js

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

packages/rocketchat-theme/assets/stylesheets/base.less

...s/rocketchat-ui-account/account/accountPreferences.coffee

...ges/rocketchat-ui-account/account/accountPreferences.html

server/methods/saveUserPreferences.coffee