Resolve merge conflict in english locales file

bigbluebutton-client/branding/default/style/css/V2Theme.css

...-client/branding/default/style/css/assets/swf/v2_skin.fla

...-client/branding/default/style/css/assets/swf/v2_skin.swf

bigbluebutton-client/locale/en_US/bbbResources.properties

bigbluebutton-client/resources/config.xml.template

bigbluebutton-client/resources/prod/lib/kurento-extension.js

bigbluebutton-client/src/org/bigbluebutton/core/PopUpUtil.as

...src/org/bigbluebutton/main/model/options/LayoutOptions.as

...ent/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml

...client/src/org/bigbluebutton/main/views/LogoutWindow.mxml

...ton-client/src/org/bigbluebutton/main/views/StarRating.as

...ient/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml

...bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml

...es/screenshare/view/components/ScreenshareViewWindow.mxml

.../bigbluebutton/modules/users/views/MediaItemRenderer.mxml

bigbluebutton-config/bin/bbb-conf

bigbluebutton-html5/client/compatibility/adapter.js

bigbluebutton-html5/client/compatibility/adjust-videos.js

...utton-html5/client/compatibility/bbb_webrtc_bridge_sip.js

bigbluebutton-html5/client/compatibility/bbblogger.js