Conflicts:
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as

Conflicts:
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as

set camera name to "Unknown Device" when chrome doesn't allow to retrieve the real name; disable the popup button when there's no camera available

increase the contrast between the modal with the firefox hint for request for media and the rest of the UI

process keyword %%SERVERURL%% and replace it by the server URL, same value configured on bigbluebutton.properties

- using localization resources for the names defined on config.xml
- green background on succeeded tests
- "Succeeded" string as result of succeeded tests

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml

when the layout is switched and the new layout is on the combo list, use the label previously assigned to it

changed the way layouts are applied to windows, attempting to fix the application of the remote layout when the user first joins

replaced the way we download the encrypted file in the recording server - wget uses much less memory than the previous method

Conflicts:
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java

Conflicts:
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
	bigbluebutton-config/web/index.html

Conflicts:
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml

cleanup; reverted the implementation which avoid the user to join twice using the same internal user id because the enter call was modified to change the internal user id everytime it's called; reverted a few files with different line endings than the original; merged properly the html5 client code

reverted back mconf implementation of the layout module; it's still buggy, but the fixes are very different from those applied to bigbluebutton/bigbluebutton@v0.9.0-release

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml