fix merge conflicts

bbb-api-demo/src/main/webapp/demoHTML5.jsp

bbb-screenshare/webrtc-extensions/chrome/README.md

bbb-screenshare/webrtc-extensions/chrome/background.js

bbb-screenshare/webrtc-extensions/chrome/logo-128x128.png

bbb-screenshare/webrtc-extensions/chrome/logo-16x16.png

bbb-screenshare/webrtc-extensions/chrome/logo-48x48.png

bbb-screenshare/webrtc-extensions/chrome/manifest.json

bigbluebutton-client/build.xml

bigbluebutton-client/resources/prod/BigBlueButton.html

bigbluebutton-client/resources/prod/lib/jquery.FSRTC.js

...ebutton-client/resources/prod/lib/jquery.jsonrpcclient.js

bigbluebutton-client/resources/prod/lib/jquery.verto.js

bigbluebutton-client/resources/prod/lib/verto-min.js

bigbluebutton-client/resources/prod/lib/verto_extension.js

...uebutton-client/resources/prod/lib/webrtc_stats_bridge.js

bigbluebutton-client/resources/prod/locales.xml

bigbluebutton-client/src/BigBlueButton.mxml

...button/modules/whiteboard/WhiteboardCanvasDisplayModel.as

...utton/modules/whiteboard/views/WhiteboardTextToolbar.mxml

...uebutton/modules/whiteboard/views/buttons/TextButton.mxml