=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategory.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategory.vm	2014-06-12 16:08:03 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategory.vm	2014-06-12 16:38:27 +0000
@@ -1,7 +1,7 @@
 { "dataElementCategory":
   {
-    "id":  "${dataElementCategory.id}" ,
-    "uid":  "${dataElementCategory.uid}" ,
+    "id":  "${dataElementCategory.id}",
+    "uid":  "${dataElementCategory.uid}",
     "name": "$!encoder.jsonEncode( ${dataElementCategory.name} )",
 	"categoryOptionCount": "${dataElementCategory.categoryOptions.size()}"
   }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategoryOption.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategoryOption.vm	2014-06-12 16:08:03 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategoryOption.vm	2014-06-12 16:38:27 +0000
@@ -1,7 +1,7 @@
 { "dataElementCategoryOption":
   {
-    "id":  "${dataElementCategoryOption.id}" ,
-    "uid":  "${dataElementCategoryOption.uid}" ,
+    "id":  "${dataElementCategoryOption.id}",
+    "uid":  "${dataElementCategoryOption.uid}",
     "name": "$!encoder.jsonEncode( ${dataElementCategoryOption.name} )",
     "startDate": "$!format.formatDate( ${dataElementCategoryOption.startDate} )",
     "endDate": "$!format.formatDate( ${dataElementCategoryOption.endDate} )",

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSet.vm	2014-06-12 16:08:03 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSet.vm	2014-06-12 16:38:27 +0000
@@ -1,7 +1,7 @@
 { "dataElementGroupSet":
   {
-    "id": "${dataElementGroupSet.id}" ,
-    "uid": "${dataElementGroupSet.uid}" ,
+    "id": "${dataElementGroupSet.id}",
+    "uid": "${dataElementGroupSet.uid}",
     "name": "$!encoder.jsonEncode( ${dataElementGroupSet.displayName} )",
 	"memberCount": "$dataElementGroupSet.members.size()"
   }