Merge branch 'develop' into feature/read-only-rooms

# Conflicts:
#	packages/rocketchat-channel-settings/client/views/channelSettings.coffee
#	packages/rocketchat-channel-settings/client/views/channelSettings.html
#	packages/rocketchat-channel-settings/server/methods/saveRoomSettings.coffee
#	packages/rocketchat-lib/server/methods/addUserToRoom.coffee
#	packages/rocketchat-ui/views/app/room.coffee
#	server/methods/createChannel.coffee
#	server/methods/createPrivateGroup.coffee
#	server/methods/joinRoom.coffee
#	server/startup/roomPublishes.coffee