Index: lams_build/build.xml
===================================================================
diff -u -rebe1058e6422f0e8ce4d72f37a130316da559d62 -rdbdc35ba34dabd0077cb84d0b3c038531f3212f0
--- lams_build/build.xml	(.../build.xml)	(revision ebe1058e6422f0e8ce4d72f37a130316da559d62)
+++ lams_build/build.xml	(.../build.xml)	(revision dbdc35ba34dabd0077cb84d0b3c038531f3212f0)
@@ -63,29 +63,31 @@
 	<target name="_clean-tools">
 		<!-- Internal target: Removes output dirs of Tools -->
 		<ant antfile="../${tool_assessment_dir}/build.xml"    target="_clean-dirs" inheritAll="false"/>
+		<ant antfile="../${tool_bbb_dir}/build.xml"           target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../${tool_chat_dir}/build.xml"          target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../${tool_daco_dir}/build.xml"          target="_clean-dirs" inheritAll="false"/>
+		<ant antfile="../${tool_eadventure_dir}/build.xml"    target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../${tool_forum_dir}/build.xml"         target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../${tool_gmap_dir}/build.xml"          target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../${tool_images_dir}/build.xml"        target="_clean-dirs" inheritAll="false"/>
+		<ant antfile="../${tool_imscc_dir}/build.xml"         target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../${tool_lamc_dir}/build.xml"          target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../${tool_laqa_dir}/build.xml"          target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../${tool_larsrc_dir}/build.xml"        target="_clean-dirs" inheritAll="false"/>
+		<ant antfile="../${tool_leader_dir}/build.xml"        target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../${tool_lanb_dir}/build.xml"          target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../${tool_notebook_dir}/build.xml"      target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../${tool_pixlr_dir}/build.xml"         target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../${tool_sbmt_dir}/build.xml"          target="_clean-dirs" inheritAll="false"/>
+		<ant antfile="../${tool_scratchie_dir}/build.xml"     target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../${tool_scribe_dir}/build.xml"        target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../${tool_spreadsheet_dir}/build.xml"   target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../${tool_survey_dir}/build.xml"        target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../${tool_task_dir}/build.xml"          target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../${tool_videorecorder_dir}/build.xml" target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../${tool_vote_dir}/build.xml"          target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../${tool_wiki_dir}/build.xml"          target="_clean-dirs" inheritAll="false"/>
-        <ant antfile="../${tool_eadventure_dir}/build.xml"    target="_clean-dirs" inheritAll="false"/>
         <ant antfile="../${tool_wookie_dir}/build.xml"        target="_clean-dirs" inheritAll="false"/>
-        <ant antfile="../${tool_imscc_dir}/build.xml"         target="_clean-dirs" inheritAll="false"/>
-        <ant antfile="../${tool_bbb_dir}/build.xml"           target="_clean-dirs" inheritAll="false"/>
 	</target>
 	
 	
@@ -100,33 +102,34 @@
 		<ant antfile="../${lams_gradebook}/build.xml"         target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${lams_www}/build.xml"               target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_assessment_dir}/build.xml"    target="copy-tags" inheritAll="false"/>
+		<ant antfile="../${tool_bbb_dir}/build.xml"           target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_chat_dir}/build.xml"          target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_daco_dir}/build.xml"          target="copy-tags" inheritAll="false"/>
+		<ant antfile="../${tool_eadventure_dir}/build.xml"    target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_forum_dir}/build.xml"         target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_gmap_dir}/build.xml"          target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_images_dir}/build.xml"        target="copy-tags" inheritAll="false"/>
+		<ant antfile="../${tool_imscc_dir}/build.xml"         target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_lamc_dir}/build.xml"          target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_laqa_dir}/build.xml"          target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_larsrc_dir}/build.xml"        target="copy-tags" inheritAll="false"/>
+		<ant antfile="../${tool_leader_dir}/build.xml"        target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_lanb_dir}/build.xml"          target="copy-tags" inheritAll="false"/>
+		<ant antfile="../${tool_mindmap_dir}/build.xml"       target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_notebook_dir}/build.xml"      target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_pixlr_dir}/build.xml"         target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_sbmt_dir}/build.xml"          target="copy-tags" inheritAll="false"/>
+		<ant antfile="../${tool_scratchie_dir}/build.xml"     target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_scribe_dir}/build.xml"        target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_spreadsheet_dir}/build.xml"   target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_survey_dir}/build.xml"        target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_task_dir}/build.xml"          target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_videorecorder_dir}/build.xml" target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_vote_dir}/build.xml"          target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_wiki_dir}/build.xml"          target="copy-tags" inheritAll="false"/>
-        <ant antfile="../${tool_eadventure_dir}/build.xml"    target="copy-tags" inheritAll="false"/>
         <ant antfile="../${tool_wookie_dir}/build.xml"        target="copy-tags" inheritAll="false"/>
-        <ant antfile="../${tool_imscc_dir}/build.xml"         target="copy-tags" inheritAll="false"/>
-        <ant antfile="../${tool_bbb_dir}/build.xml"           target="copy-tags" inheritAll="false"/>
-		<ant antfile="../${tool_mindmap_dir}/build.xml"       target="copy-tags" inheritAll="false"/>
-		
 		<echo>MANUALLY COPY TAGS TO UNLISTED PROJECTS:
-			  Scratche, Kaltura and other public and private tools</echo>
+			  Kaltura and other public and private tools</echo>
 	</target>
 
 	
@@ -287,31 +290,33 @@
 	
 	<target name="_deploy-tools">
 		<echo>Deploying Tools</echo>
+		<ant antfile="../${tool_assessment_dir}/build.xml"    target="deploy-tool" inheritAll="false" />
+		<ant antfile="../${tool_bbb_dir}/build.xml"           target="deploy-tool" inheritAll="false" />
+		<ant antfile="../${tool_chat_dir}/build.xml"          target="deploy-tool" inheritAll="false" />
+		<ant antfile="../${tool_daco_dir}/build.xml"          target="deploy-tool" inheritAll="false" />
+		<ant antfile="../${tool_eadventure_dir}/build.xml"    target="deploy-tool" inheritAll="false" />
 		<ant antfile="../${tool_forum_dir}/build.xml"         target="deploy-tool" inheritAll="false" />
-		<ant antfile="../${tool_lanb_dir}/build.xml"          target="deploy-tool" inheritAll="false" />
+		<ant antfile="../${tool_gmap_dir}/build.xml"          target="deploy-tool" inheritAll="false" />
+		<ant antfile="../${tool_images_dir}/build.xml"        target="deploy-tool" inheritAll="false" />
+		<ant antfile="../${tool_imscc_dir}/build.xml"         target="deploy-tool" inheritAll="false" />
+		<ant antfile="../${tool_lamc_dir}/build.xml"          target="deploy-tool" inheritAll="false" />
 		<ant antfile="../${tool_laqa_dir}/build.xml"          target="deploy-tool" inheritAll="false" />
-		<ant antfile="../${tool_sbmt_dir}/build.xml"          target="deploy-tool" inheritAll="false" />
-  		<ant antfile="../${tool_chat_dir}/build.xml"          target="deploy-tool" inheritAll="false" />
 		<ant antfile="../${tool_larsrc_dir}/build.xml"        target="deploy-tool" inheritAll="false" />
- 		<ant antfile="../${tool_vote_dir}/build.xml"          target="deploy-tool" inheritAll="false" />
-  		<ant antfile="../${tool_notebook_dir}/build.xml"      target="deploy-tool" inheritAll="false" />
+		<ant antfile="../${tool_leader_dir}/build.xml"        target="deploy-tool" inheritAll="false" />
+		<ant antfile="../${tool_mindmap_dir}/build.xml"       target="deploy-tool" inheritAll="false" />
+		<ant antfile="../${tool_lanb_dir}/build.xml"          target="deploy-tool" inheritAll="false" />
+		<ant antfile="../${tool_notebook_dir}/build.xml"      target="deploy-tool" inheritAll="false" />
+		<ant antfile="../${tool_pixlr_dir}/build.xml"         target="deploy-tool" inheritAll="false" />
+		<ant antfile="../${tool_sbmt_dir}/build.xml"          target="deploy-tool" inheritAll="false" />
+		<ant antfile="../${tool_scratchie_dir}/build.xml"     target="deploy-tool" inheritAll="false" />
+		<ant antfile="../${tool_scribe_dir}/build.xml"        target="deploy-tool" inheritAll="false" />
+		<ant antfile="../${tool_spreadsheet_dir}/build.xml"   target="deploy-tool" inheritAll="false" />
   		<ant antfile="../${tool_survey_dir}/build.xml"        target="deploy-tool" inheritAll="false" />
-  		<ant antfile="../${tool_scribe_dir}/build.xml"        target="deploy-tool" inheritAll="false" />
   		<ant antfile="../${tool_task_dir}/build.xml"          target="deploy-tool" inheritAll="false" />
-		<ant antfile="../${tool_gmap_dir}/build.xml"          target="deploy-tool" inheritAll="false" />
-		<ant antfile="../${tool_spreadsheet_dir}/build.xml"   target="deploy-tool" inheritAll="false" />
-		<ant antfile="../${tool_daco_dir}/build.xml"          target="deploy-tool" inheritAll="false" />
-		<ant antfile="../${tool_wiki_dir}/build.xml"          target="deploy-tool" inheritAll="false" />
-		<ant antfile="../${tool_images_dir}/build.xml"        target="deploy-tool" inheritAll="false" />
 		<ant antfile="../${tool_videorecorder_dir}/build.xml" target="deploy-tool" inheritAll="false" />
-		<ant antfile="../${tool_mindmap_dir}/build.xml"       target="deploy-tool" inheritAll="false" />
-		<ant antfile="../${tool_assessment_dir}/build.xml"    target="deploy-tool" inheritAll="false" />
-		<ant antfile="../${tool_pixlr_dir}/build.xml"         target="deploy-tool" inheritAll="false" />
-		<ant antfile="../${tool_eadventure_dir}/build.xml"    target="deploy-tool" inheritAll="false" />
+		<ant antfile="../${tool_vote_dir}/build.xml"          target="deploy-tool" inheritAll="false" />
+		<ant antfile="../${tool_wiki_dir}/build.xml"          target="deploy-tool" inheritAll="false" />
 		<ant antfile="../${tool_wookie_dir}/build.xml"        target="deploy-tool" inheritAll="false" />
-		<ant antfile="../${tool_imscc_dir}/build.xml"         target="deploy-tool" inheritAll="false" />
-		<ant antfile="../${tool_bbb_dir}/build.xml"           target="deploy-tool" inheritAll="false" />
-		<ant antfile="../${tool_lamc_dir}/build.xml"          target="deploy-tool" inheritAll="false" />
 	</target>