Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml

Included a message to inform the user that a connection rejected is
probably caused by multiple browser tabs joining the same conference.

Now the window ajusts itself to fit the message and the message is centered.
Also, removed reconnect button if the connection is rejected.

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml

bbb-apps now rejects duplicate connection attempts from the same session.
This fixes the problems that happened when a user connected to the same
conference in two different browser tabs, and ended up with two clients
in the same session.

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml

Merge branch 'bbb-check-localization' of github.com:pedrobmarin/bigbluebutton into bbb-check-localization

This was causing the sanity check to fail.

The client tries to reconnect 3 times before failing and asking if
the user wants to use flash audio or cancel.

This applies to connect and disconnect websocket events.

fixed the cancel button visibility when it take a while to enable webrtc but eventually it worked, so the next time the connecting window is presented, the cancel button should be hidden again instead of remain visible

to test it, apply this patch:

diff --git a/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js b/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
index b9b35bb..f497afa 100755
--- a/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
+++ b/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
@@ -33,7 +33,7 @@ function joinWebRTCVoiceConference() {
                                BBB.webRTCConferenceCallEnded();
                                break;
                        case 'started':
-                               BBB.webRTCConferenceCallStarted();
+                               setTimeout(function() { BBB.webRTCConferenceCallStarted(); }, 15000);
                                break;
                        case 'connecting':
                                BBB.webRTCConferenceCallConnecting();
@@ -79,7 +79,7 @@ function startWebRTCAudioTest(){
                                BBB.webRTCEchoTestEnded();
                                break;
                        case 'started':
-                               BBB.webRTCEchoTestStarted();
+                               setTimeout(function() { BBB.webRTCEchoTestStarted(); }, 15000);
                                break;
                        case 'connecting':
                                BBB.webRTCEchoTestConnecting();

It had some leftover debug code that caused it to only convert the
first 10 recordings instead of all of them.

The name of the '.done' file is changed so the update will be re-run
automatically.

When generating swf files for later versions of Flash pdf2swf will insert an
unsupported command "allowDomain" into the generated swf files.

Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/Constants.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/Constants.java

The following information was added:
+ moderator_pass (Moderator password)
+ viewer_pass (Viewer password)
+ create_time (Create time)
+ create_date (Create date)

This information is necessary so bbb-apps can send with the
meeting_created_message event

iOS video support