=== 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-11-04 20:45:20 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2012-11-13 14:14:11 +0000
@@ -553,15 +553,15 @@
     <property name="systemSettingStore" ref="org.hisp.dhis.setting.SystemSettingStore" />
     <property name="flags">
       <list>
-        <value>afghanistan</value>      
-		<value>armenia</value>
+        <value>afghanistan</value>
+        <value>armenia</value>
         <value>bangladesh</value>
         <value>benin</value>
         <value>botswana</value>
         <value>burkina_faso</value>
         <value>burkina_faso_coat_of_arms</value>
-		<value>cambodia</value>
-		<value>china</value>
+        <value>cambodia</value>
+        <value>china</value>
         <value>colombia</value>
         <value>ecuador</value>
         <value>ethiopia</value>
@@ -576,8 +576,8 @@
         <value>kenya</value>
         <value>lesotho</value>
         <value>liberia</value>
-		<value>malawi</value>
-		<value>myanmar</value>
+        <value>malawi</value>
+        <value>myanmar</value>
         <value>mali</value>
         <value>mozambique</value>
         <value>namibia</value>
@@ -600,6 +600,7 @@
         <value>tajikistan</value>
         <value>tanzania</value>
         <value>timor_leste</value>
+        <value>republic_of_trinidad_and_tobago</value>
         <value>togo</value>
         <value>uganda</value>
         <value>vietnam</value>

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/republic_of_trinidad_and_tobago.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/republic_of_trinidad_and_tobago.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/republic_of_trinidad_and_tobago.png	2012-11-13 14:14:11 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2012-11-13 08:20:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2012-11-13 14:14:11 +0000
@@ -100,6 +100,7 @@
 paraguay=Paraguay
 nicaragua=Nicaragua
 solomon_islands=Solomon Islands
+republic_of_trinidad_and_tobago=Republic of Trinidad & Tobago
 vanuatu=Vanuatu
 timor_leste=Timor-Leste
 application_introduction=Application introduction