fix merge conflict

README.md

bigbluebutton-client/resources/config.xml.template

bigbluebutton-client/resources/prod/BigBlueButton.html

bigbluebutton-client/src/VideoconfModule.mxml

...rc/org/bigbluebutton/main/views/AudioSelectionWindow.mxml

...lient/src/org/bigbluebutton/modules/phone/PhoneOptions.as

.../bigbluebutton/modules/phone/managers/FlashCallManager.as

...bigbluebutton/modules/phone/managers/WebRTCCallManager.as

...g/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml

.../org/bigbluebutton/modules/phone/maps/WebRTCEventMap.mxml

...ebutton/modules/phone/views/components/ToolbarButton.mxml

...luebutton/modules/videoconf/maps/VideoEventMapDelegate.as

...bigbluebutton/modules/videoconf/model/VideoConfOptions.as

bigbluebutton-config/bigbluebutton-release

bigbluebutton-config/bin/bbb-conf

bigbluebutton-config/web/index.html

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