=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElement.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElement.vm	2014-10-28 22:36:19 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElement.vm	2015-09-03 09:45:19 +0000
@@ -1,28 +1,28 @@
-{ "dataElement": 
+{ "dataElement":
   {
     "id": "$!{dataElement.id}",
-	"uid": "$!dataElement.uid",
+    "uid": "$!dataElement.uid",
     "name": "$!encoder.jsonEncode( ${dataElement.displayName} )",
     "alternativeName": "$!encoder.jsonEncode( ${dataElement.alternativeNamee} )",
     "shortName": "$!encoder.jsonEncode( ${dataElement.displayShortName} )",
     "code": "$!encoder.jsonEncode( ${dataElement.code} )",
     "description": "$!encoder.jsonEncode( ${dataElement.displayDescription} )",
     "type": "$!{dataElement.type}",
-	"valueType": "$!{dataElement.type}",
-	"domainType": "${dataElement.getDomainTypeNullSafe()}",
+    "valueType": "$!{dataElement.type}",
+    "domainType": "${dataElement.getDomainTypeNullSafe()}",
     "aggregationOperator": "$!{dataElement.aggregationOperator}",
-	"categoryCombo": "$!encoder.xmlEncode( ${dataElement.categoryCombo.name} )",
-	"url": "$!encoder.xmlEncode( ${dataElement.url} )",
-	"lastUpdated": "$!format.formatDate( ${dataElement.lastUpdated} )",
-	"approveData": "$!{dataElement.approveData}",
-	
-	#set( $size = ${dataElement.dataSets.size()} )
-	"dataSets": [
-	#foreach( $ds in ${dataElement.dataSets} )
-	  {
-		"name": "$!encoder.xmlEncode( ${ds.name} )"
-	  }#if( $velocityCount < $size ),#end
-	#end
-	]
-  } 
+    "categoryCombo": "$!encoder.xmlEncode( ${dataElement.categoryCombo.name} )",
+    "url": "$!encoder.xmlEncode( ${dataElement.url} )",
+    "lastUpdated": "$!format.formatDate( ${dataElement.lastUpdated} )",
+    "approveData": "$!{dataElement.approveData}",
+
+    #set( $size = ${dataElement.dataSets.size()} )
+    "dataSets": [
+    #foreach( $ds in ${dataElement.dataSets} )
+    {
+    "name": "$!encoder.xmlEncode( ${ds.name} )"
+    }#if( $velocityCount < $size ),#end
+    #end
+    ]
+  }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramIndicator.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramIndicator.vm	2015-07-10 16:14:22 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramIndicator.vm	2015-09-03 09:45:19 +0000
@@ -1,13 +1,13 @@
-{ "programIndicator": 
+{ "programIndicator":
   {
     "id": $!{programIndicator.id},
     "uid": "$!{programIndicator.uid}",
     "name": "$!encoder.jsonEncode( ${programIndicator.displayName} )",
     "code": "$!encoder.jsonEncode( ${programIndicator.code} )",
-	"description": "$!encoder.xmlEncode( ${programIndicator.displayDescription} )",
+    "description": "$!encoder.xmlEncode( ${programIndicator.displayDescription} )",
     "valueType": "$!{programIndicator.valueType}",
-	"rootDate" : "$!format.formatDate( $programIndicator.rootDate )",
-	"expression": "$!encoder.jsonEncode( $!{programIndicator.expression} )",
-	"filter": "$!encoder.jsonEncode( $!{programIndicator.filter} )"
+    "rootDate" : "$!format.formatDate( $programIndicator.rootDate )",
+    "expression": "$!encoder.jsonEncode( $!{programIndicator.expression} )",
+    "filter": "$!encoder.jsonEncode( $!{programIndicator.filter} )"
   }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonTrackedEntityAttribute.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonTrackedEntityAttribute.vm	2014-07-02 12:11:16 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonTrackedEntityAttribute.vm	2015-09-03 09:45:19 +0000
@@ -1,17 +1,17 @@
 { "attribute":
   {
-    "id": "${attribute.id}",
-	"uid": "${attribute.uid}",
-	"name": "$!encoder.jsonEncode( ${attribute.name} )",
-	"code": "$!encoder.jsonEncode( ${attribute.code} )",
-	"description": "$!encoder.jsonEncode( ${attribute.description} )",
-	"unique":  "$!{attribute.unique}",
-	"valueType": "$!attribute.valueType",
-	"displayInListNoProgram": "$!attribute.displayInListNoProgram",
-	"inherit": "$!attribute.inherit",
-	"confidential": "$!attribute.confidential",
-	"optionSet": "$!attribute.optionSet.name",
-	"orgunitScope": "$!attribute.orgunitScope",
-	"programScope": "$!attribute.programScope"
+		"id": "${attribute.id}",
+		"uid": "${attribute.uid}",
+		"name": "$!encoder.jsonEncode( ${attribute.name} )",
+		"code": "$!encoder.jsonEncode( ${attribute.code} )",
+		"description": "$!encoder.jsonEncode( ${attribute.description} )",
+		"unique":  "$!{attribute.unique}",
+		"valueType": "$!attribute.valueType",
+		"displayInListNoProgram": "$!attribute.displayInListNoProgram",
+		"inherit": "$!attribute.inherit",
+		"confidential": "$!attribute.confidential",
+		"optionSet": "$!attribute.optionSet.name",
+		"orgunitScope": "$!attribute.orgunitScope",
+		"programScope": "$!attribute.programScope"
   }
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/jsonAttribute.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/jsonAttribute.vm	2014-06-13 09:05:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/jsonAttribute.vm	2015-09-03 09:45:19 +0000
@@ -1,13 +1,13 @@
 { "attribute":
   {
-	"id": "${attribute.id}",
-	"uid": "${attribute.uid}",
-	"name": "$!encoder.jsonEncode( ${attribute.name} )",
-	"valueType": "$!encoder.jsonEncode( ${attribute.valueType} )",
-	"mandatory": "$!{attribute.mandatory}",
-	"dataelement": "$!{attribute.dataElementAttribute}",
-	"indicator": "$!{attribute.indicatorAttribute}",
-	"organisationunit": "$!{attribute.organisationUnitAttribute}",
-	"user": "$!{attribute.userAttribute}"
+		"id": "${attribute.id}",
+		"uid": "${attribute.uid}",
+		"name": "$!encoder.jsonEncode( ${attribute.name} )",
+		"valueType": "$!encoder.jsonEncode( ${attribute.valueType} )",
+		"mandatory": "$!{attribute.mandatory}",
+		"dataelement": "$!{attribute.dataElementAttribute}",
+		"indicator": "$!{attribute.indicatorAttribute}",
+		"organisationunit": "$!{attribute.organisationUnitAttribute}",
+		"user": "$!{attribute.userAttribute}"
   }
 }