diff --git a/bigbluebutton-client/.actionScriptProperties b/bigbluebutton-client/.actionScriptProperties
index 26368b92e202f4ad33fbf0a430230ece3c52f8ed..93dd1e8ff985b1ac0c600a53f84e7dbe8ecf97b8 100755
--- a/bigbluebutton-client/.actionScriptProperties
+++ b/bigbluebutton-client/.actionScriptProperties
@@ -1,51 +1,52 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<actionScriptProperties mainApplicationPath="BigBlueButton.mxml" projectUUID="2f78753b-2e4c-41b4-8cf4-eddb768eb4b3" version="6">
-  <compiler additionalCompilerArguments="-locale=" autoRSLOrdering="true" copyDependentFiles="true" flexSDK="Flex 3.5" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" sourceFolderPath="src" strict="true" targetPlayerVersion="10.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
-    <compilerSourcePath>
-      <compilerSourcePathEntry kind="1" linkType="1" path="tests/integration"/>
-    </compilerSourcePath>
-    <libraryPath defaultLinkType="1">
-      <libraryPathEntry kind="4" path="">
-        <modifiedEntries>
-          <libraryPathEntry kind="3" linkType="4" path="${PROJECT_FRAMEWORKS}/libs/framework.swc" useDefaultLinkType="true">
-            <crossDomainRsls>
-              <crossDomainRslEntry autoExtract="true" policyFileUrl="" rslUrl="framework_3.1.0.2710.swz"/>
-              <crossDomainRslEntry autoExtract="true" policyFileUrl="" rslUrl="framework_3.1.0.2710.swf"/>
-            </crossDomainRsls>
-          </libraryPathEntry>
-        </modifiedEntries>
-        <excludedEntries>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/qtp.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_dmv.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_agent.swc" useDefaultLinkType="false"/>
-        </excludedEntries>
-      </libraryPathEntry>
-      <libraryPathEntry kind="1" linkType="1" path="libs"/>
-    </libraryPath>
-    <sourceAttachmentPath/>
-  </compiler>
-  <applications>
-    <application path="src/main.mxml"/>
-    <application path="MessagingUnitTests.mxml"/>
-    <application path="BigBlueButton.mxml"/>
-    <application path="BigBlueButtonUnitTests.mxml"/>
-    <application path="DeskshareStandalone.mxml"/>
-    <application path="src/TestRunners.mxml"/>
-  </applications>
-  <modules>
-    <module application="src/BigBlueButton.mxml" destPath="DynamicInfoModule.swf" optimize="true" sourcePath="src/DynamicInfoModule.mxml"/>
-    <module application="src/BigBlueButton.mxml" destPath="PhoneModule.swf" optimize="true" sourcePath="src/PhoneModule.mxml"/>
-    <module application="src/BigBlueButton.mxml" destPath="PresentModule.swf" optimize="true" sourcePath="src/PresentModule.mxml"/>
-    <module application="src/BigBlueButton.mxml" destPath="ExampleChatModule.swf" optimize="true" sourcePath="src/ExampleChatModule.mxml"/>
-    <module application="src/BigBlueButton.mxml" destPath="DeskShareModule.swf" optimize="true" sourcePath="src/DeskShareModule.mxml"/>
-    <module application="src/BigBlueButton.mxml" destPath="VideoconfModule.swf" optimize="true" sourcePath="src/VideoconfModule.mxml"/>
-    <module application="src/BigBlueButton.mxml" destPath="ViewersModule.swf" optimize="true" sourcePath="src/ViewersModule.mxml"/>
-    <module application="src/BigBlueButton.mxml" destPath="ChatModule.swf" optimize="true" sourcePath="src/ChatModule.mxml"/>
-    <module application="src/BigBlueButton.mxml" destPath="ListenersModule.swf" optimize="true" sourcePath="src/ListenersModule.mxml"/>
-    <module application="src/BigBlueButton.mxml" destPath="WhiteboardModule.swf" optimize="true" sourcePath="src/WhiteboardModule.mxml"/>
-  </modules>
-  <buildCSSFiles>
-    <buildCSSFileEntry destPath="bin" sourcePath="src/branding/css/theme.css"/>
-  </buildCSSFiles>
-</actionScriptProperties>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<actionScriptProperties mainApplicationPath="BigBlueButton.mxml" projectUUID="2f78753b-2e4c-41b4-8cf4-eddb768eb4b3" version="6">
+  <compiler additionalCompilerArguments="-locale=" autoRSLOrdering="true" copyDependentFiles="true" flexSDK="Flex 3.5" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" sourceFolderPath="src" strict="true" targetPlayerVersion="10.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
+    <compilerSourcePath>
+      <compilerSourcePathEntry kind="1" linkType="1" path="tests/integration"/>
+    </compilerSourcePath>
+    <libraryPath defaultLinkType="1">
+      <libraryPathEntry kind="4" path="">
+        <modifiedEntries>
+          <libraryPathEntry kind="3" linkType="4" path="${PROJECT_FRAMEWORKS}/libs/framework.swc" useDefaultLinkType="true">
+            <crossDomainRsls>
+              <crossDomainRslEntry autoExtract="true" policyFileUrl="" rslUrl="framework_3.1.0.2710.swz"/>
+              <crossDomainRslEntry autoExtract="true" policyFileUrl="" rslUrl="framework_3.1.0.2710.swf"/>
+            </crossDomainRsls>
+          </libraryPathEntry>
+        </modifiedEntries>
+        <excludedEntries>
+          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/qtp.swc" useDefaultLinkType="false"/>
+          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation.swc" useDefaultLinkType="false"/>
+          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_dmv.swc" useDefaultLinkType="false"/>
+          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_agent.swc" useDefaultLinkType="false"/>
+        </excludedEntries>
+      </libraryPathEntry>
+      <libraryPathEntry kind="1" linkType="1" path="libs"/>
+    </libraryPath>
+    <sourceAttachmentPath/>
+  </compiler>
+  <applications>
+    <application path="src/main.mxml"/>
+    <application path="MessagingUnitTests.mxml"/>
+    <application path="BigBlueButton.mxml"/>
+    <application path="BigBlueButtonUnitTests.mxml"/>
+    <application path="DeskshareStandalone.mxml"/>
+    <application path="src/TestRunners.mxml"/>
+  </applications>
+  <modules>
+    <module application="src/BigBlueButton.mxml" destPath="DynamicInfoModule.swf" optimize="true" sourcePath="src/DynamicInfoModule.mxml"/>
+    <module application="src/BigBlueButton.mxml" destPath="PhoneModule.swf" optimize="true" sourcePath="src/PhoneModule.mxml"/>
+    <module application="src/BigBlueButton.mxml" destPath="PresentModule.swf" optimize="true" sourcePath="src/PresentModule.mxml"/>
+    <module application="src/BigBlueButton.mxml" destPath="ExampleChatModule.swf" optimize="true" sourcePath="src/ExampleChatModule.mxml"/>
+    <module application="src/BigBlueButton.mxml" destPath="DeskShareModule.swf" optimize="true" sourcePath="src/DeskShareModule.mxml"/>
+    <module application="src/BigBlueButton.mxml" destPath="VideoconfModule.swf" optimize="true" sourcePath="src/VideoconfModule.mxml"/>
+    <module application="src/BigBlueButton.mxml" destPath="ViewersModule.swf" optimize="true" sourcePath="src/ViewersModule.mxml"/>
+    <module application="src/BigBlueButton.mxml" destPath="ChatModule.swf" optimize="true" sourcePath="src/ChatModule.mxml"/>
+    <module application="src/BigBlueButton.mxml" destPath="ListenersModule.swf" optimize="true" sourcePath="src/ListenersModule.mxml"/>
+    <module application="src/BigBlueButton.mxml" destPath="WhiteboardModule.swf" optimize="true" sourcePath="src/WhiteboardModule.mxml"/>
+    <module application="src/BigBlueButton.mxml" destPath="BreakoutModule.swf" optimize="true" sourcePath="src/BreakoutModule.mxml"/>
+  </modules>
+  <buildCSSFiles>
+    <buildCSSFileEntry destPath="bin" sourcePath="src/branding/css/theme.css"/>
+  </buildCSSFiles>
+</actionScriptProperties>
diff --git a/bigbluebutton-client/.flexProperties b/bigbluebutton-client/.flexProperties
index eb94363b6e528975b849aa064f58b5766c111794..afb930671bcf77c496834ff0e190ffdebf61e78a 100755
--- a/bigbluebutton-client/.flexProperties
+++ b/bigbluebutton-client/.flexProperties
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<flexProperties flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="1"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flexProperties enableServiceManager="false" flexServerFeatures="0" flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="1"/>
diff --git a/bigbluebutton-client/locale/bg_BG/bbbResources.properties b/bigbluebutton-client/locale/bg_BG/bbbResources.properties
index 62706e06d7de7d0761f26f23434db197f1163350..058a04d24a6bbda81a5ff9c0637e33f72c399355 100755
--- a/bigbluebutton-client/locale/bg_BG/bbbResources.properties
+++ b/bigbluebutton-client/locale/bg_BG/bbbResources.properties
@@ -1,4 +1,4 @@
-
+
 # BigBlueButton.mxml
 bbb.pageTitle = BigBlueButton
 
@@ -8,13 +8,13 @@ bbb.mainshell.statusProgress.connecting = Свързване със сървър
 bbb.mainshell.statusProgress.loading = Зареждане на {0} модул/а
 bbb.mainshell.statusProgress.cannotConnectServer = Съжалявам, не мога да се свържа със сървърът.
 bbb.mainshell.copyrightLabel2 = (c) 2010, BigBlueButton build {0} - За повече информация вижте http://www.bigbluebutton.org/.
-bbb.mainshell.logBtn.toolTip = Отвори Дневник Прозорцът
+bbb.mainshell.logBtn.toolTip = Отвори Дневник Прозорецът
 bbb.mainshell.fullScreenBtn.toolTip = Премини на Цял Екран
 bbb.mainshell.resetLayoutBtn.toolTip = Презареди Изгледа
 
 # OldLocaleWarnWIndow.mxml
 bbb.oldlocalewindow.reminder1=Вие може да имате стар превод на BigBlueButton.
-bbb.oldlocalewindow.reminder2=Моля изчистете кеша на браузера си и опитайте отново.
+bbb.oldlocalewindow.reminder2=Моля изчистете кеша на браузъра си и опитайте отново.
 bbb.oldlocalewindow.windowTitle=Предупреждение: Стар превод на езика
 
 # LogWindow.mxml
@@ -47,7 +47,7 @@ bbb.viewers.viewersGrid.statusItemRenderer = Състояние
 bbb.viewers.viewersGrid.statusItemRenderer.raiseHand.toolTip = Вдигната ръка на {0}
 bbb.viewers.viewersGrid.statusItemRenderer.streamIcon.toolTip = Натисни за да видиш.
 bbb.viewers.viewersGrid.statusItemRenderer.presIcon.toolTip = Презентатор
-bbb.viewers.presentBtn.toolTip = Изберете кои уеб учстници да са презентатори.
+bbb.viewers.presentBtn.toolTip = Изберете кои уеб участници да са презентатори.
 bbb.viewers.raiseHandBtn.toolTip = Натисни за да вдигнеш ръка.
 bbb.viewers.presentBtn.label = Смени Презентаторът
 bbb.viewers.kickUserBtn.toolTip = Изхвърли потребител
@@ -62,7 +62,7 @@ bbb.presentation.slideNumLbl =
 bbb.presentation.forwardBtn.toolTip = Следваща страница
 bbb.presentation.resetZoomBtn.toolTip = Презареди Мащаба
 bbb.presentation.presenterNameLbl = {0} текущо презентират.
-bbb.presentation.maximizeRestoreBtn.toolTip = Увелечете този прозорец
+bbb.presentation.maximizeRestoreBtn.toolTip = Увеличете този прозорец
 bbb.presentation.maximizeRestoreBtn.toolTip2 = Възстановяване на предишният размер
 bbb.presentation.clickToUpload = Зареди презентация
 bbb.presentation.maxUploadFileExceededAlert = Грешка: Файлът е по-голям от позволеното.
@@ -175,4 +175,4 @@ bbb.highlighter.toolbar.thickness = Смени дебелина
 
 # WhiteboardButton.mxml
 bbb.highlighter.button.toolTipShow = Покажи Дъската
-bbb.highlighter.button.toolTipHide = Скрий Дъската
\ No newline at end of file
+bbb.highlighter.button.toolTipHide = Скрий Дъската
diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template
index d6b8aed0ab77ea38cbbd28d78e2980c6e1160d87..78986ee1582821c799550cde159db6396e438ead 100755
--- a/bigbluebutton-client/resources/config.xml.template
+++ b/bigbluebutton-client/resources/config.xml.template
@@ -69,5 +69,11 @@
             host="http://HOST"
 		/>-->
 		
+		<!--<module name="BreakoutModule" url="BreakoutModule.swf?v=VERSION" 
+			uri="rtmp://192.168.0.225/bigbluebutton" 
+			host="http://192.168.0.225" 
+			dependsOn="ViewersModule"
+		/>-->
+		
 	</modules>
 </config>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
index e7a501ffd9ef953fda6bc9b1b85cf21480296157..d2a93531a47177082cf2b00fe11b5cae66d2f975 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
@@ -43,6 +43,8 @@ package org.bigbluebutton.main.model.users
 		[Bindable] public var room:String = "";
 		[Bindable] public var authToken:String = "";
 		
+		[Bindable] public var selected:Boolean = false;
+		
 		private var _status:StatusCollection = new StatusCollection();
 				
 		public function get status():ArrayCollection {