Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -re93068db348eae017a32e5939839119aea3c51d3 -rde65d00b5bf887f55beabea327159f0df35f0933
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -re93068db348eae017a32e5939839119aea3c51d3 -rde65d00b5bf887f55beabea327159f0df35f0933
Binary files differ
Index: lams_central/web/lams_preloader.swf
===================================================================
diff -u -r6e921f0eba97c377550ad11dbe6e86fb825c3067 -rde65d00b5bf887f55beabea327159f0df35f0933
Binary files differ
Index: lams_flash/src/central/flash/lams_authoring_main.fla
===================================================================
diff -u -rb5a8e9ab4637d1ea1d21b674079706ab7ceb8388 -rde65d00b5bf887f55beabea327159f0df35f0933
Binary files differ
Index: lams_flash/src/central/flash/lams_monitoring_main.fla
===================================================================
diff -u -rb5a8e9ab4637d1ea1d21b674079706ab7ceb8388 -rde65d00b5bf887f55beabea327159f0df35f0933
Binary files differ
Index: lams_flash/src/central/flash/lams_wizard_main.fla
===================================================================
diff -u -r98067f551c42188befc105667e3734a731b235e2 -rde65d00b5bf887f55beabea327159f0df35f0933
Binary files differ
Index: lams_flash/src/central/flash/main.as
===================================================================
diff -u -r6e921f0eba97c377550ad11dbe6e86fb825c3067 -rde65d00b5bf887f55beabea327159f0df35f0933
--- lams_flash/src/central/flash/main.as	(.../main.as)	(revision 6e921f0eba97c377550ad11dbe6e86fb825c3067)
+++ lams_flash/src/central/flash/main.as	(.../main.as)	(revision de65d00b5bf887f55beabea327159f0df35f0933)
@@ -7,7 +7,6 @@
 //Temp values to be removed / repplaced at deployment
 /**/
 if(StringUtils.isEmpty(serverURL)){
-	//_root.serverURL = "http://dolly.uklams.net:8080/lams/";
 	_root.serverURL = "http://localhost:8080/lams/";
 	Debugger.log('serverURL is not defined, using defualt:'+_root.serverURL ,Debugger.CRITICAL,'main','ROOT');			
 }
@@ -75,11 +74,10 @@
 	_root.isMac = false;
 }				
 
-//Set stage alignment to top left and prent scaling
+//Set stage alignment to top left and prevent scaling
 Stage.align = "TL";
 Stage.scaleMode = "noScale";
 
-
 //Start the application, passing in the top level clip, i.e. _root
 var app:Application = Application.getInstance();
 app.main(this);
@@ -94,10 +92,5 @@
 };
 var success = receive_lc.connect("importUpdate_lc_" + uniqueID);
 
-
 //Make app listener for stage resize events
 Stage.addListener(app);
-
-
-
-
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as
===================================================================
diff -u -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 -rde65d00b5bf887f55beabea327159f0df35f0933
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as	(.../Application.as)	(revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as	(.../Application.as)	(revision de65d00b5bf887f55beabea327159f0df35f0933)
@@ -182,8 +182,12 @@
         _UILoaded = false;
 
 		var layout_component_no = (_isEditMode) ? EditOnFlyLayoutManager.COMPONENT_NO : DefaultLayoutManager.COMPONENT_NO;
-		loader.start(COMMON_COMPONENT_NO + layout_component_no);
+
+		_root.preloader.setStartValue(50);
+		_root.preloader.setEndValue(100);
 		
+		_root.preloader.start(COMMON_COMPONENT_NO + layout_component_no);
+		
 		_customCursor_mc = _container_mc.createEmptyMovieClip('_customCursor_mc', CCURSOR_DEPTH);			
 		
 		//add the cursors:
@@ -211,7 +215,7 @@
     private function configLoaded(){
         //Now that the config class is ready setup the UI and data, call to setupData() first in 
 		//case UI element constructors use objects instantiated with setupData()
-        loader.complete();
+        _root.preloader.complete();
 		setupData();
 		checkDataLoaded();
     }
@@ -343,7 +347,7 @@
 			
 			_layout.manager.addLayoutItem(evt.target.className, evt.target);
 			
-			loader.complete();
+			_root.preloader.complete();
 			
 			if(_layout.manager.completedLayout) {
 				_UILoaded =  true;
@@ -406,7 +410,8 @@
         onResize();
 		
 		//Remove the loading screen
-		loader.stop();
+		_root.preloader.stop();
+		_root._visible = true;
 		
 		if(SHOW_DEBUGGER){
 			showDebugger();
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Application.as
===================================================================
diff -u -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 -rde65d00b5bf887f55beabea327159f0df35f0933
--- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Application.as	(.../Application.as)	(revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Application.as	(.../Application.as)	(revision de65d00b5bf887f55beabea327159f0df35f0933)
@@ -275,7 +275,6 @@
     * work with the application
     */
     private function start(){
-		trace('starting...');
 		
         //Fire off a resize to set up sizes
         onResize();
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/Application.as
===================================================================
diff -u -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 -rde65d00b5bf887f55beabea327159f0df35f0933
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/Application.as	(.../Application.as)	(revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/Application.as	(.../Application.as)	(revision de65d00b5bf887f55beabea327159f0df35f0933)
@@ -165,7 +165,9 @@
         _container_mc = container_mc;
         _UILoaded = false;
         
-		loader.start(DefaultLayoutManager.COMPONENT_NO);
+		_root.preloader.setStartValue(50);
+		_root.preloader.setEndValue(100);
+		_root.preloader.start(DefaultLayoutManager.COMPONENT_NO);
 		
 		_customCursor_mc = _container_mc.createEmptyMovieClip('_customCursor_mc', CCURSOR_DEPTH);			
 		
@@ -193,7 +195,7 @@
     private function configLoaded(){
         //Now that the config class is ready setup the UI and data, call to setupData() first in 
 		//case UI element constructors use objects instantiated with setupData()
-        loader.complete();
+        _root.preloader.complete();
 		setupData();
 		checkDataLoaded();
 		
@@ -374,7 +376,7 @@
 
 			_layout.manager.addLayoutItem(new LFLayoutItem(evt.target.className, evt.target));
 			
-			loader.complete();
+			_root.preloader.complete();
             
             //If all of them are loaded set UILoad accordingly
 			if(_layout.manager.completedLayout){
@@ -438,7 +440,8 @@
         onResize();
 		
 		// Remove the loading screen
-		loader.stop();
+		_root.preloader.stop();
+		_root._visible = true;
 		
 		if(SHOW_DEBUGGER){
 			showDebugger();
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Application.as
===================================================================
diff -u -rbd5508187ce7eaa3fc1299856158b2d80d01c8a9 -rde65d00b5bf887f55beabea327159f0df35f0933
--- lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Application.as	(.../Application.as)	(revision bd5508187ce7eaa3fc1299856158b2d80d01c8a9)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Application.as	(.../Application.as)	(revision de65d00b5bf887f55beabea327159f0df35f0933)
@@ -131,7 +131,9 @@
         _container_mc = container_mc;
         _UILoaded = false;
         
-		loader.start(COMPONENT_NO);
+		_root.preloader.setStartValue(50);
+		_root.preloader.setEndValue(100);
+		_root.preloader.start(COMPONENT_NO);
 		
 		_customCursor_mc = _container_mc.createEmptyMovieClip('_customCursor_mc', CCURSOR_DEPTH);			
 		
@@ -157,7 +159,7 @@
         //Now that the config class is ready setup the UI and data, call to setupData() first in 
 		//case UI element constructors use objects instantiated with setupData()
         
-		loader.complete();
+		_root.preloader.complete();
 		setupData();
 		checkDataLoaded();
 		
@@ -277,7 +279,7 @@
                 default:
             }
             
-			loader.complete();
+			_root.preloader.complete();
 			
             //If all of them are loaded set UILoad accordingly
 			if(_wizardLoaded){
@@ -318,7 +320,8 @@
         onResize();
 		
 		//Remove the loading screen
-		loader.stop();
+		_root.preloader.stop();
+		_root._visible = true;
 		
 		if(SHOW_DEBUGGER){
 			showDebugger();
Index: lams_flash/src/central/flash/preloader.fla
===================================================================
diff -u -r6e921f0eba97c377550ad11dbe6e86fb825c3067 -rde65d00b5bf887f55beabea327159f0df35f0933
Binary files differ
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as
===================================================================
diff -u -r031262744a76013a5fc13b63c4b42acb28db04fc -rde65d00b5bf887f55beabea327159f0df35f0933
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as	(.../ApplicationParent.as)	(revision 031262744a76013a5fc13b63c4b42acb28db04fc)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as	(.../ApplicationParent.as)	(revision de65d00b5bf887f55beabea327159f0df35f0933)
@@ -130,7 +130,7 @@
     */
     private function onDictionaryLoad(evt:Object){
         if(evt.type=='load'){
-			loader.complete();
+			_root.preloader.complete();
             _dictionaryLoaded = true;
 			Debugger.log('Dictionary loaded :',Debugger.CRITICAL,'onDictionaryLoad','Application');			
         } else {
@@ -144,7 +144,7 @@
     */
     private function onThemeLoad(evt:Object) {
         if(evt.type=='load'){
-			loader.complete();
+			_root.preloader.complete();
             _themeLoaded = true;
 			Debugger.log('!Theme loaded :',Debugger.CRITICAL,'onThemeLoad','Application');		
         } else {
@@ -262,8 +262,8 @@
         }
     }
 	
-	public function get loader():LFLoader{
-		if(_root.loader != undefined) { return _root.loader; }
+	public function get loader():MovieClip{
+		if(_root.preloader != undefined) { return _root.preloader; }
 		else {
 		}
 	}	
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -rd81882d79c6925fa850e2e261478fef54d1afb23 -rde65d00b5bf887f55beabea327159f0df35f0933
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -rd81882d79c6925fa850e2e261478fef54d1afb23 -rde65d00b5bf887f55beabea327159f0df35f0933
Binary files differ
Index: lams_monitoring/web/lams_wizard.swf
===================================================================
diff -u -rbd5508187ce7eaa3fc1299856158b2d80d01c8a9 -rde65d00b5bf887f55beabea327159f0df35f0933
Binary files differ
Index: lams_monitoring/web/lams_wizard_library.swf
===================================================================
diff -u -rbd5508187ce7eaa3fc1299856158b2d80d01c8a9 -rde65d00b5bf887f55beabea327159f0df35f0933
Binary files differ