diff --git a/bigbluebutton-client/src/BigBlueButtonMainContainer.mxml b/bigbluebutton-client/src/BigBlueButtonMainContainer.mxml
index ce43e6a8c8..b8770d05a9 100755
--- a/bigbluebutton-client/src/BigBlueButtonMainContainer.mxml
+++ b/bigbluebutton-client/src/BigBlueButtonMainContainer.mxml
@@ -78,8 +78,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
       }
       
       private function queryForSessionToken():void {
-		  trace("***** queryForSessionToken ****");
-		  _timer = new Timer(5000, 6);
+		  /** We attempt to query several times to try to get the sessionToken from the browser url.
+		  * (ralam oct 6, 2015)
+		  */
+		  _timer = new Timer(500, 6);
 		  _timer.addEventListener(TimerEvent.TIMER, timerHandler);
 		  _timer.addEventListener(TimerEvent.TIMER_COMPLETE, completeHandler);
 		  _timer.start();
@@ -92,7 +94,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 	  }
 
       private function timerHandler(e:TimerEvent):void{
-		  trace("***** timerHandler ****");
 		  if (getSessionToken() != "") {
 			  _timer.stop();
 			  BBB.getConfigManager().loadConfig();
@@ -103,14 +104,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
       private function completeHandler(e:TimerEvent):void {
 		  trace("Failed to get session token.");
       }
-		
-      private function configLoadedEventHandler(e:Event):void {
-	  	LogUtil.initLogging();
-        trace("***** Config Loaded ****");
-        mainShell.initOptions(null);
-        ShortcutOptions.initialize();
-      }
-      
+		      
       private var api:ExternalApiCallbacks;
       
       private function setupAPI():void {
diff --git a/bigbluebutton-client/src/org/bigbluebutton/core/managers/ConfigManager2.as b/bigbluebutton-client/src/org/bigbluebutton/core/managers/ConfigManager2.as
index 4f2b8fcc52..86600c565e 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/core/managers/ConfigManager2.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/core/managers/ConfigManager2.as
@@ -56,7 +56,7 @@ package org.bigbluebutton.core.managers
 			urlLoader.addEventListener(Event.COMPLETE, handleComplete);
 			
 			var date:Date = new Date();
-            var localeReqURL:String = buildRequestURL() + "?a=" + date.time;
+            var localeReqURL:String = buildRequestURL();
             trace("::loadConfig [{0}]", [localeReqURL]);
 			
 			trace(localeReqURL + " session=[" + sessionToken + "]"); 
diff --git a/bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as b/bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
index 659322862b..0712c100e1 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
@@ -25,12 +25,13 @@ package org.bigbluebutton.core.model
 	public class Config
 	{
 		private var config:XML = null;
-		private var _modules:Dictionary = new Dictionary();
+		private var _modules:Dictionary;
 		private var _numModules:int;
 		
 		public function Config(config:XML)
 		{
 			this.config = config;
+			buildModuleDescriptors();
 		}
 
 		public function get help():Object {
@@ -134,13 +135,20 @@ package org.bigbluebutton.core.model
 			}
 			return null;
 		}
+				
+		public function getModules():Dictionary{
+			return _modules;
+		}
 		
-		public function getModules():Dictionary{	
-			trace("Getting modules");
-			var list:XMLList = config.modules.module;
+		public function getModulesXML():XMLList{
+			return config.modules.module;
+		}
+		
+		private function buildModuleDescriptors():Dictionary{	
+			_modules = new Dictionary();
+			var list:XMLList = getModulesXML();
 			var item:XML;
 			for each(item in list){
-				trace("module=" + item.toXMLString());
 				var mod:ModuleDescriptor = new ModuleDescriptor(item);
 				_modules[item.@name] = mod;
 				_numModules++;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
index ba54bf1da5..39e64c799d 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
@@ -63,7 +63,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		
 	<EventHandlers type="{ConfigLoadedEvent.CONFIG_LOADED_EVENT}" >
 		<MethodInvoker generator="{ModulesProxy}" method="handleConfigLoaded" />
-		<MethodInvoker generator="{SkinningService}" method="loadSkins" arguments="{event.config.skinning}" />
+		<MethodInvoker generator="{SkinningService}" method="loadSkins"/>
 	</EventHandlers>
 
 	<EventHandlers type="{ModuleLoadEvent.START_ALL_MODULES}">
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 1130f2ac92..b09308e6b9 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleManager.as
@@ -64,7 +64,7 @@ package org.bigbluebutton.main.model.modules
 			var resolver:DependancyResolver = new DependancyResolver();
 			sorted = resolver.buildDependencyTree(modules);
 			
-			modulesDispatcher.sendConfigLoadedEvent();
+			modulesDispatcher.sendPortTestEvent();
 		}
 		
 		public function loadConfig():void {
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
index 095b17425c..f55b52a629 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
@@ -50,10 +50,6 @@ package org.bigbluebutton.main.model.modules
       dispatcher = new Dispatcher();
       
     }
-    
-	public function sendConfigLoadedEvent():void {
-		dispatcher.dispatchEvent(new ConfigLoadedEvent());
-	}
 	
     public function sendLoadProgressEvent(moduleName:String, loadProgress:Number):void{
       var loadEvent:ModuleLoadEvent = new ModuleLoadEvent(ModuleLoadEvent.MODULE_LOAD_PROGRESS);
diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
index 16c897b055..d81ebda918 100755
--- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
+++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
@@ -172,6 +172,7 @@ class ApiController {
    * JOIN API
    *********************************************/
   def join = {
+    println("#JOIN API")
     String API_CALL = 'join'
     log.debug CONTROLLER_NAME + "#${API_CALL}"
   	ApiErrors errors = new ApiErrors()