Fix merge conflicts

README.md

bigbluebutton-html5/imports/api/audio/client/bridge/sip.js

...luebutton-html5/imports/api/audio/client/manager/index.js

...ml5/imports/api/captions/server/handlers/captionUpdate.js

...orts/api/chat/server/modifiers/clearUserSystemMessages.js

bigbluebutton-html5/imports/api/chat/server/publishers.js

...tton-html5/imports/api/deskshare/client/bridge/service.js

bigbluebutton-html5/imports/api/polls/server/publishers.js

...on-html5/imports/api/users/server/handlers/emojiStatus.js

...-html5/imports/api/users/server/handlers/listeningOnly.js

...5/imports/api/users/server/handlers/lockedStatusChange.js

...l5/imports/api/users/server/handlers/validateAuthToken.js

...html5/imports/api/users/server/methods/assignPresenter.js

...tml5/imports/api/users/server/methods/listenOnlyToggle.js

...tton-html5/imports/api/users/server/methods/muteToggle.js

...-html5/imports/api/users/server/methods/setEmojiStatus.js

...ml5/imports/api/users/server/methods/validateAuthToken.js

...utton-html5/imports/api/users/server/modifiers/addUser.js

...imports/api/users/server/modifiers/setConnectionStatus.js

bigbluebutton-html5/imports/startup/client/auth.js