diff --git a/bigbluebutton-client/README b/bigbluebutton-client/README
new file mode 100644
index 0000000000000000000000000000000000000000..6822178493da88f65324843aef377abb22ca652f
--- /dev/null
+++ b/bigbluebutton-client/README
@@ -0,0 +1,4 @@
+see http://code.google.com/p/bigbluebutton
+
+Developing the client
+1. Copy src/conf/config.xml.dev to src/cong/config.xml
diff --git a/bigbluebutton-client/build.xml b/bigbluebutton-client/build.xml
index f05069d6beec0b1548203cb59369b0fc6244df92..c19e20a2ff74b37cbfb5ea9a5a2d29eb83a07aa1 100755
--- a/bigbluebutton-client/build.xml
+++ b/bigbluebutton-client/build.xml
@@ -23,8 +23,11 @@
 	<property name="VIDEO" value="VideoconfModule" />
 	<property name="HIGHLIGHTER" value="HighlighterModule" />
 	<property name="DYN_INFO" value="DynamicInfoModule" />
-
+	
+	<property name="AVAILABLE_LOCALES" value="az_AZ,de_DE,el_GR,en_US,es_ES,es_LA,fr_FR,hu_HU,it_IT,lt_LT,nb_NO,nl_NL,pl_PL,pt_BR,pt_PT,ro_RO,ru_RU,tr_TR,vi_VN,zh_CN,zh_TW"/>
+	
 	<xmlproperty file="${SRC_DIR}/conf/locales.xml" collapseAttributes="true"/>
+	
 	<target name="init-ant-contrib">
 		<property name="ant-contrib.jar" location="${BASE_DIR}/build/lib/ant-contrib-0.6.jar"/>
 		<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${ant-contrib.jar}"/>
@@ -32,8 +35,9 @@
 
 	<target name="localization" depends="init-ant-contrib">
 		<echo message="Parsing ${SRC_DIR}/conf/locales.xml for supported locales"/>
-		<echo message="Supported locales ${locales.locale.code}"/>
-		<foreach list="${locales.locale.code}" target="build-locale" param="supportedlocale" delimiter=","/>
+		<echo message="Available locales ${AVAILABLE_LOCALES}"/>
+		<!--foreach list="${locales.locale.code}" target="build-locale" param="supportedlocale" delimiter=","/-->
+		<foreach list="${AVAILABLE_LOCALES}" target="build-locale" param="supportedlocale" delimiter=","/>
 	</target>
 	
 	<target name="build-locale">
@@ -54,10 +58,26 @@
         </if>
         <compileLocale locale="${supportedlocale}" />        
 	</target>
-	
+		
 	<macrodef name="compileLocale" description="Compiles the Resource package for the given locale">
 		<attribute name="locale" default="en_US"/>
 		<sequential>
+			<echo message="Building @{locale}"/>
+		<available file="${LOCALE_DIR}/@{locale}" type="dir" property="locale.dir.present"/>
+		<if> 
+           <equals arg1="${locale.dir.present}" arg2="true"/> 
+           <then> 
+              <echo message="No need to copy ${LOCALE_DIR}/@{locale}"/> 
+           </then> 
+           <else> 
+              <echo message="Need to copy ${LOCALE_DIR}/@{locale}"/> 
+              <exec dir="${BASE_DIR}" vmlauncher="true" executable="copylocale">
+				<arg value="en_US"/>
+    			<arg value="@{locale}"/>
+			</exec>
+           </else> 
+        </if>
+        
 			<!--
 			Create the Flex Home directory for the language in question.
 			This is necessary to compensate for a bug in pre-3.2 releases of 
diff --git a/bigbluebutton-client/copyright.txt b/bigbluebutton-client/copyright.txt
deleted file mode 100644
index c1f56c138c2780e4d9563e8e340c4d70287ad4e1..0000000000000000000000000000000000000000
--- a/bigbluebutton-client/copyright.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-Copyright 2006-2010 by respective authors (see below). All rights reserved.
- 
-This library is free software; you can redistribute it and/or modify it under the 
-terms of the GNU Lesser General Public License as published by the Free Software 
-Foundation; either version 2.1 of the License, or (at your option) any later 
-version. 
- 
-This library is distributed in the hope that it will be useful, but WITHOUT ANY 
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
-PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- 
-You should have received a copy of the GNU Lesser General Public License along 
-with this library; if not, write to the Free Software Foundation, Inc., 
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
- 
-The Blindside Project
diff --git a/bigbluebutton-client/src/conf/.gitignore b/bigbluebutton-client/src/conf/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..7e90cf108542922e8926c2dc54486e23d0ec7032
--- /dev/null
+++ b/bigbluebutton-client/src/conf/.gitignore
@@ -0,0 +1 @@
+config.xml
diff --git a/bigbluebutton-client/src/conf/config.xml b/bigbluebutton-client/src/conf/config.xml.dev
old mode 100755
new mode 100644
similarity index 100%
rename from bigbluebutton-client/src/conf/config.xml
rename to bigbluebutton-client/src/conf/config.xml.dev
diff --git a/bigbluebutton-client/src/conf/config.xml.template b/bigbluebutton-client/src/conf/config.xml.template
old mode 100755
new mode 100644
diff --git a/bigbluebutton-client/src/conf/locales.xml b/bigbluebutton-client/src/conf/locales.xml
old mode 100755
new mode 100644