Merge branch 'matthias-brun-develop' into develop

i18n/en.i18n.json

...chat-channel-settings/client/views/channelSettings.coffee

...etchat-channel-settings/client/views/channelSettings.html

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

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

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

...s/rocketchat-ui-sidenav/side-nav/createChannelFlex.coffee

...ges/rocketchat-ui-sidenav/side-nav/createChannelFlex.html

...cketchat-ui-sidenav/side-nav/listPrivateGroupsFlex.coffee

...s/rocketchat-ui-sidenav/side-nav/privateGroupsFlex.coffee

...ges/rocketchat-ui-sidenav/side-nav/privateGroupsFlex.html

packages/rocketchat-ui/views/app/privateHistory.coffee

packages/rocketchat-ui/views/app/privateHistory.html

server/methods/channelsList.coffee

server/methods/createChannel.coffee

server/methods/createPrivateGroup.coffee

server/methods/unarchiveRoom.coffee

server/publications/subscription.coffee

server/startup/roomPublishes.coffee