diff --git a/bigbluebutton-client/build.xml b/bigbluebutton-client/build.xml
index 6f07787524b700d901b0d98b73e7d9c5d828f147..546e3ec48f46be3be2033b1ed58b30d1d96bdb3b 100755
--- a/bigbluebutton-client/build.xml
+++ b/bigbluebutton-client/build.xml
@@ -25,6 +25,7 @@
 	<property name="VIDEO" value="VideoconfModule" />
 	<property name="WHITEBOARD" value="WhiteboardModule" />
 	<property name="DYN_INFO" value="DynamicInfoModule" />
+	<property name="BREAKOUT" value="BreakoutModule" />
 	
 	<property name="AVAILABLE_LOCALES" value="az_AZ,bg_BG,de_DE,el_GR,en_US,es_ES,es_LA,fr_FR,fr_CA,hu_HU,it_IT,lt_LT,nb_NO,nl_NL,pl_PL,pt_BR,pt_PT,ro_RO,ru_RU,tr_TR,vi_VN,zh_CN,zh_TW,sv_SE,fa_IR,ja_JP"/>
 	
@@ -114,6 +115,10 @@
 		</copy>		
 	</target>
 	
+	<target name="build-breakout" description="Compile Breakout Module" >
+		<build-module src="${SRC_DIR}" target="${BREAKOUT}" />
+	</target>
+	
 	<target name="build-chat" description="Compile Chat Module">
 		<build-module src="${SRC_DIR}" target="${CHAT}" />
 	</target>
@@ -169,8 +174,8 @@
 	
 	<!-- just a grouping of modules to compile -->
 	<target name="build-main-chat-viewers-listeners-present" 
-			depends="build-bbb-main, build-chat, build-viewers, build-listeners, build-present"
-			description="Compile main, chat, viewers, listeners, present modules">
+			depends="build-bbb-main, build-chat, build-viewers, build-listeners, build-present, build-breakout"
+			description="Compile main, chat, viewers, listeners, present, breakout modules">
 	</target>
 	
 	<!-- just a grouping of modules to compile -->
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleManager.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleManager.as
index f0a30aa3b5d0b0223e5bbb7221d84675e3ab3b97..de3cb926cd14aa253685af907412cd1bde280caa 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleManager.as
@@ -34,7 +34,6 @@ package org.bigbluebutton.main.model.modules
 	import org.bigbluebutton.common.LogUtil;
 	import org.bigbluebutton.common.Role;
 	import org.bigbluebutton.main.events.ModuleLoadEvent;
-	import org.bigbluebutton.main.events.UserServicesEvent;
 	import org.bigbluebutton.main.model.ConferenceParameters;
 	import org.bigbluebutton.main.model.ConfigParameters;