--- a/sbin/build/client.xml	Wed Dec 07 12:34:56 2011 +0100
+++ b/sbin/build/client.xml	Wed Dec 07 12:36:08 2011 +0100
@@ -16,7 +16,7 @@
 	<delete dir="${basedir}/../../build" />
 	<mkdir  dir="${basedir}/../../build" />
 		
-	<target name="makeall" depends="concatenate,compile,jslint" />
+	<target name="makeall" depends="concatenate,compile" />
 	
 	<target name="make_templates" description="Concatenate the html templates together">
 	    <for param="file">
@@ -70,13 +70,28 @@
 	<target name="concatenate" description="Build the developer release file" depends="make_templates">
 	    <concat encoding="UTF-8" outputencoding="UTF-8" destfile="../../build/LdtPlayer-release.js">
 			<filelist dir="../../src/js/" files="header.js" />
-	        <filelist dir="../../src/js/libs" files="jwplayer.js mustache.js raphael.js" />
-	        <filelist dir="../../src/js" files="main.js" />
-	    	<filelist dir="../../build" files="compiled_templates.js" />
-	    	<filelist dir="../../src/js" files="pop.js utils.js data.js site.js ui.js widgets.js layout.js init.js" />
+			
+      <filelist dir="../../src/js/libs" files="jwplayer.js popcorn.js popcorn.code.js popcorn.jwplayer.js popcorn.mediafragment.js popcorn.youtube.js raphael.js" />
+      
+      <fileset dir="../../src/js/libs" casesensitive="yes">
+					<include name="**/*.js"/>					
+			</fileset>
+      
+      <!-- required file before everything else -->
+	    <filelist dir="../../src/js" files="main.js" />
+
+      <!-- templates -->
+    	<filelist dir="../../build" files="compiled_templates.js" />
+      
+      <!-- core files -->
+    	<filelist dir="../../src/js" files="pop.js utils.js data.js site.js ui.js widgets.js layout.js init.js" />
+
+      <!-- widgets -->
 			<fileset dir="../../src/js/widgets" casesensitive="yes">
 					<include name="**/*.js"/>					
 			</fileset>
+
+      <!-- serializers -->
 			<fileset dir="../../src/js/serializers" casesensitive="yes">
 					<include name="**/*.js"/>					
 			</fileset>