Merge branch 'master' of github.com:wet-boew/wet-boew into feature-mu…

…ltimedia-player

Conflicts:
	build/js/pe-ap-min.js

build.xml

@@ -17,6 +17,8 @@
 		<ant dir="${src.dir}/theme-gcwu-fegc" antfile="build.xml" target="build" inheritAll="false"/>
 		<echo level="info" message="---Building GCWU Intranet Theme---"/>
 		<ant dir="${src.dir}/theme-gcwu-intranet" antfile="build.xml" target="build" inheritAll="false"/>
+		<echo level="info" message="---Building CLF2 Theme---"/>
+		<ant dir="${src.dir}/theme-clf2-nsi2" antfile="build.xml" target="build" inheritAll="false"/>
 		<antcall target="clean-css"/>
 	</target>
 
@@ -26,6 +28,7 @@
 		<ant dir="${src.dir}/js" target="clean-css" antfile="build.xml" inheritAll="false"/>
 		<ant dir="${src.dir}/theme-gcwu-fegc" target="clean-css" antfile="build.xml" inheritAll="false"/>
 		<ant dir="${src.dir}/theme-gcwu-intranet" target="clean-css" antfile="build.xml" inheritAll="false"/>
+		<ant dir="${src.dir}/theme-clf2-nsi2" target="clean-css" antfile="build.xml" inheritAll="false"/>
 	</target>
 
 	<target name="clean">
@@ -34,12 +37,14 @@
 		<ant dir="${src.dir}/js" target="clean" antfile="build.xml" inheritAll="false"/>
 		<ant dir="${src.dir}/theme-gcwu-fegc" target="clean" antfile="build.xml" inheritAll="false"/>
 		<ant dir="${src.dir}/theme-gcwu-intranet" target="clean" antfile="build.xml" inheritAll="false"/>
+		<ant dir="${src.dir}/theme-clf2-nsi2" target="clean" antfile="build.xml" inheritAll="false"/>
 		<delete dir="${dist.dir}" />
 	</target>
 	<target name="test">
 		<echo level="info" message="---Running with JSLint---"/>
 		<ant dir="${src.dir}/js" target="test" antfile="build.xml" inheritAll="false"/>
 		<ant dir="${src.dir}/theme-gcwu-fegc" target="test" antfile="build.xml" inheritAll="false"/>
 		<ant dir="${src.dir}/theme-gcwu-intranet" target="test" antfile="build.xml" inheritAll="false"/>
+		<ant dir="${src.dir}/theme-clf2-nsi2" target="test" antfile="build.xml" inheritAll="false"/>
 	</target>
 </project>