=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2015-08-25 09:48:55 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2015-09-08 15:03:31 +0000
@@ -751,6 +751,8 @@
 expression_is_empty=Expression is empty
 category_option_combo_does_not_exist=Category option combo does not exist
 data_element_does_not_exist=Data element does not exist
+constant_does_not_exist=Constant does not exist
+org_unit_group_does_not_exist=Organisation unit group does not exist
 id_not_numeric=Identifier is not numeric
 expression_not_well_formed=Expression is not well-formed
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramIndicatorController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramIndicatorController.java	2015-07-13 03:59:57 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramIndicatorController.java	2015-09-08 15:03:31 +0000
@@ -46,6 +46,9 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
+/**
+ * @author Lars Helge Overland
+ */
 @Controller
 @RequestMapping( value = ProgramIndicatorSchemaDescriptor.API_ENDPOINT )
 public class ProgramIndicatorController