=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/DefaultI18nLocaleService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/DefaultI18nLocaleService.java	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/DefaultI18nLocaleService.java	2015-02-19 09:54:46 +0000
@@ -78,6 +78,7 @@
         {
             langs.add( new BaseIdentifiableObject( lang, lang, new Locale( lang ).getDisplayLanguage() ) );
         }
+		//TODO: This needs to be fixed. We should have a list of ISO 639-1 and ISO 639-2 codes (when needed) together
 		langs.add( new BaseIdentifiableObject( "tet", "tet", "Tetum" ));
 
         for ( String country : Locale.getISOCountries() )

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/relationship/DefaultRelationshipService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/relationship/DefaultRelationshipService.java	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/relationship/DefaultRelationshipService.java	2015-02-19 09:54:46 +0000
@@ -97,6 +97,6 @@
     public Collection<Relationship> getRelationships( TrackedEntityInstance entityInstanceA,
         RelationshipType relationshipType )
     {
-        throw new NotImplementedException("Notsupported");
+        throw new NotImplementedException("");
     }
 }

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/Encoder.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/Encoder.java	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/Encoder.java	2015-02-19 09:54:46 +0000
@@ -47,7 +47,7 @@
 
     public String xmlEncode( String object )
     {
-        return StringEscapeUtils.escapeXml11( object );
+        return StringEscapeUtils.escapeXml( object );
     }
 
     public String jsEncode( String object )