=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2012-09-22 18:42:59 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2012-09-24 18:02:46 +0000
@@ -512,7 +512,8 @@
         <value>botswana</value>
         <value>burkina_faso</value>
         <value>burkina_faso_coat_of_arms</value>
-        <value>cambodia</value>
+	<value>cambodia</value>
+	<value>china</value>
         <value>ethiopia</value>
         <value>gambia</value>
         <value>ghana</value>
@@ -603,6 +604,7 @@
 	  <value>af</value>
 	  <value>ar</value>
 	  <value>am</value>
+	  <value>zh</value>
 	  <value>de</value>
 	  <value>en</value>
 	  <value>es</value>

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/china.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/china.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/china.png	2012-09-24 18:02:46 +0000 differ