diff --git a/api-docs/apiLive.htm b/api-docs/apiLive.htm
index 34887c066..d16f91eaa 100644
--- a/api-docs/apiLive.htm
+++ b/api-docs/apiLive.htm
@@ -103,7 +103,7 @@
 	<li><a href="#creates_and_updates">Creating and Updating</a></li>
 	<li><a href="#dates_and_numbers">Updating Dates and Numbers</a></li>
 	<li><a href="#field_descriptions">Field Descriptions</a></li>
-	<li><a href="#authentication_overview">Authentication Overview</a></li>	
+	<li><a href="#authentication_overview">Authentication Overview</a></li>
 	<li><a href="#errors">Errors</a></li>
 	<li><a href="#batch_api">Batch API</a></li>
 	<li><a href="#fullapi_matrix">Full API Matrix</a></li>
@@ -816,7 +816,7 @@
 								<td></td>
 								<td></td>
 								<td></td>
-							</tr>							
+							</tr>
 							<tr>
 								<td><a href="#recurringdepositaccounts_transactions">Recurring Deposit Transactions</a></td>
 								<td>recurringdepositaccounts/{accountId}/transactions?command=deposit</td>
@@ -1822,7 +1822,7 @@
 								<td></td>
 								<td>holidays/{holidayId}?command=activate</td>
 								<td><a href="#holidays_activate">Activate a Holiday</a></td>
-								<td></td>								
+								<td></td>
 								<td></td>
 								<td></td>
 							</tr>
@@ -2381,8 +2381,8 @@
 								<td></td>
 								<td>{entityType}/{entityId}/documents/{documentId}/attachment</td>
 								<td></td>
-								<td><a href="#documents_retrieve_file">Retrieve 
-									binary file associated with a 
+								<td><a href="#documents_retrieve_file">Retrieve
+									binary file associated with a
 									Document</a>
 								</td>
 								<td></td>
@@ -2608,8 +2608,8 @@
 						</table>
 					</div>
 				</div>
-			</div>			
-		
+			</div>
+
 		</div>
 
 		<div id="main-content-wrapper">
@@ -2763,16 +2763,16 @@
 						application as you shouldn't need to do any date format conversion
 						prior to issuing your POST or PUT request.
 					</p>
-<code>JSON examples: 
+<code>JSON examples:
 {
-	"locale": "en_US", 
-	"dateFormat": "dd MMMM yyyy", 
-	"openingDate": "01 July 2007" 
-} 
+	"locale": "en_US",
+	"dateFormat": "dd MMMM yyyy",
+	"openingDate": "01 July 2007"
+}
 
 {
 	"locale": "en_US",
-	"dateFormat": "yyyy-MM-dd", 
+	"dateFormat": "yyyy-MM-dd",
 	"openingDate": "2007-03-21"
 }
 </code>
@@ -2783,11 +2783,11 @@
 						back an error message if you forget.</p>
 <code>JSON examples:
 {
-	"locale": "en_US", 
+	"locale": "en_US",
 	"principal": "240,400.88"
-} 
-{ 
-	"locale": "fr_CH", 
+}
+{
+	"locale": "fr_CH",
 	"principal": "240 400.88"
 }
 </code>
@@ -2828,48 +2828,48 @@
 					</p>
 				</div>
 				<div class="method-example">
-<code> 
-// A Javascript/Jquery example of how to login to Mifos X and use its api. 
-// Typically, the javascript application would 
-// 1) Display a login page to retrieve the username and password. 
-// 2) Send the username and password to a function 
+<code>
+// A Javascript/Jquery example of how to login to Mifos X and use its api.
+// Typically, the javascript application would
+// 1) Display a login page to retrieve the username and password.
+// 2) Send the username and password to a function
 //    such as setBasicAuthKey below which sets the HTTP Basic Auth key.
 // 3) The HTTP Basic Auth key is used in all subsequent requests
-// (see the function executeAjaxRequest below). 
+// (see the function executeAjaxRequest below).
 
-function setBasicAuthKey(username, password) { 
+function setBasicAuthKey(username, password) {
 
-	var jqxhr = $.ajax({ 
+	var jqxhr = $.ajax({
 		url : "authentication?username=" + username + "&password=" + password,
-		type : 'POST', 
+		type : 'POST',
 		contentType : "application/json; charset=utf-8",
-		dataType : 'json', 
-		data : "{}", 
-		cache : false, 
-		success : function(data, textStatus, jqXHR) { 
-			basicAuthKey = data.base64EncodedAuthenticationKey; 
-		}, 
-		error : function(jqXHR, textStatus, errorThrown) { 
-			//error processing 
-		} 
-	}); 
-} 
-
-function executeAjaxRequest(url, verbType, jsonData, basicAuthKey, successFunction, errorFunction) { 
-	var jqxhr = $.ajax({ 
-		url : url,
-		type : verbType, //POST, GET, PUT or DELETE 
-		contentType : "application/json; charset=utf-8", 
-		dataType : 'json', 
-		data : jsonData, 
-		cache : false, 
-		beforeSend : function(xhr) {
-			xhr.setRequestHeader("Authorization", "Basic " + basicAuthKey); 
+		dataType : 'json',
+		data : "{}",
+		cache : false,
+		success : function(data, textStatus, jqXHR) {
+			basicAuthKey = data.base64EncodedAuthenticationKey;
 		},
-		success : successFunction, 
-		error : errorFunction 
-	}); 
-} 
+		error : function(jqXHR, textStatus, errorThrown) {
+			//error processing
+		}
+	});
+}
+
+function executeAjaxRequest(url, verbType, jsonData, basicAuthKey, successFunction, errorFunction) {
+	var jqxhr = $.ajax({
+		url : url,
+		type : verbType, //POST, GET, PUT or DELETE
+		contentType : "application/json; charset=utf-8",
+		dataType : 'json',
+		data : jsonData,
+		cache : false,
+		beforeSend : function(xhr) {
+			xhr.setRequestHeader("Authorization", "Basic " + basicAuthKey);
+		},
+		success : successFunction,
+		error : errorFunction
+	});
+}
 </code>
 					</div>
 			</div>
@@ -2880,7 +2880,7 @@ function executeAjaxRequest(url, verbType, jsonData, basicAuthKey, successFuncti
 					<h3>Batch API</h3>
 
 					<p>
-						The Mifos X Batch API enables a consumer to access significant amounts of data in a single call or to make changes to several objects at once. 
+						The Mifos X Batch API enables a consumer to access significant amounts of data in a single call or to make changes to several objects at once.
 						Batching allows a consumer to pass instructions for several operations in a  single HTTP request. A consumer can also specify dependencies between related operations. Once all operations have been completed, a consolidated response will be  passed back and the HTTP connection will be closed.
 					</p>
 
@@ -2895,7 +2895,7 @@ function executeAjaxRequest(url, verbType, jsonData, basicAuthKey, successFuncti
 					</p>
 
 					<p>
-						Batch API is able to handle deeply nested dependent requests as well nested parameters. As shown in the example, requests are dependent on each other as, 1&lt--2&lt--6, i.e a nested dependency, where request '6' is not directly dependent on request '1' but still it is one of the nested child of request '1'. 
+						Batch API is able to handle deeply nested dependent requests as well nested parameters. As shown in the example, requests are dependent on each other as, 1&lt--2&lt--6, i.e a nested dependency, where request '6' is not directly dependent on request '1' but still it is one of the nested child of request '1'.
 						In the same way Batch API could handle a deeply nested dependent value, such as {..[..{..,$.parameter_name,..}..]}.
 					</p>
 
@@ -2907,86 +2907,86 @@ POST https://DomainName/api/v1/batches
 					<code class="method-request">
 POST batches
 Content-Type: application/json Request Body:
-[  
-   {  
+[
+   {
       "requestId":1,
       "relativeUrl":"clients",
       "method":"POST",
-      "headers":[  
-         {  
+      "headers":[
+         {
             "name":"Content-type",
             "value":"text/html"
          }
       ],
-      "body":"{  
-	    \"officeId\": 1, 
-	    \"firstname\": \"Petra\", 
-	    \"lastname\": \"Yton\", 
-	    \"externalId\": \"ex_externalId1\", 
-	    \"dateFormat\": \"dd MMMM yyyy\", 
-	    \"locale\": \"en\", 
-	    \"active\": true, 
-	    \"activationDate\": \"04 March 2009\", 
-	    \"submittedOnDate\": \"04 March 2009\" 
+      "body":"{
+	    \"officeId\": 1,
+	    \"firstname\": \"Petra\",
+	    \"lastname\": \"Yton\",
+	    \"externalId\": \"ex_externalId1\",
+	    \"dateFormat\": \"dd MMMM yyyy\",
+	    \"locale\": \"en\",
+	    \"active\": true,
+	    \"activationDate\": \"04 March 2009\",
+	    \"submittedOnDate\": \"04 March 2009\"
    	 }"
    },
-   {  
+   {
       "requestId":2,
       "relativeUrl":"loans",
       "method":"POST",
-      "headers":[  
-         {  
+      "headers":[
+         {
             "name":"Content-type",
             "value":"text/html"
          }
       ],
       "reference":1,
-      "body":"{ \"dateFormat\": \"dd MMMM yyyy\", 
-                \"locale\": \"en_GB\", 
-                \"clientId\": \"$.clientId\", 
-                \"productId\": 26, 
-                \"principal\": \"10,000.00\", 
-                \"loanTermFrequency\": 12, 
-                \"loanTermFrequencyType\": 2, 
-                \"loanType\": \"individual\", 
-                \"numberOfRepayments\": 10, 
-                \"repaymentEvery\": 1, 
-                \"repaymentFrequencyType\": 2, 
-                \"interestRatePerPeriod\": 10, 
-                \"amortizationType\": 1, 
-                \"interestType\": 0, 
-                \"interestCalculationPeriodType\": 1, 
-                \"transactionProcessingStrategyId\": 1, 
-                \"expectedDisbursementDate\": \"10 Jun 2013\", 
-                \"submittedOnDate\": \"10 Jun 2013\"   
+      "body":"{ \"dateFormat\": \"dd MMMM yyyy\",
+                \"locale\": \"en_GB\",
+                \"clientId\": \"$.clientId\",
+                \"productId\": 26,
+                \"principal\": \"10,000.00\",
+                \"loanTermFrequency\": 12,
+                \"loanTermFrequencyType\": 2,
+                \"loanType\": \"individual\",
+                \"numberOfRepayments\": 10,
+                \"repaymentEvery\": 1,
+                \"repaymentFrequencyType\": 2,
+                \"interestRatePerPeriod\": 10,
+                \"amortizationType\": 1,
+                \"interestType\": 0,
+                \"interestCalculationPeriodType\": 1,
+                \"transactionProcessingStrategyId\": 1,
+                \"expectedDisbursementDate\": \"10 Jun 2013\",
+                \"submittedOnDate\": \"10 Jun 2013\"
               }"
    },
-   {  
+   {
       "requestId":3,
       "relativeUrl":"loans/$.loanId/charges",
       "method":"POST",
       "reference":2,
-      "headers":[  
-         {  
+      "headers":[
+         {
             "name":"Content-type",
             "value":"text/html"
          }
       ],
-      "body":"{  
-              \"chargeId\": \"2\", 
-              \"locale\": \"en\", 
-              \"amount\": \"100\", 
-              \"dateFormat\": \"dd MMMM yyyy\", 
-              \"dueDate\": \"29 April 2013\" 
+      "body":"{
+              \"chargeId\": \"2\",
+              \"locale\": \"en\",
+              \"amount\": \"100\",
+              \"dateFormat\": \"dd MMMM yyyy\",
+              \"dueDate\": \"29 April 2013\"
             }"
    },
-   {  
+   {
       "requestId":4,
       "relativeUrl":"loans/$.loanId/charges",
       "method":"GET",
       "reference":2,
-      "headers":[  
-         {  
+      "headers":[
+         {
             "name":"Content-type",
             "value":"text/html"
          }
@@ -2996,100 +2996,100 @@ Content-Type: application/json Request Body:
 ]
 					</code>
 					<code class="method-response">
-[  
-   {  
+[
+   {
       "requestId":1,
       "statusCode":200,
-      "headers":[  
-         {  
+      "headers":[
+         {
             "name":"Content-type",
             "value":"text/html"
          },
-         {  
+         {
             "name":"X-Mifos-Platform-TenantId",
             "value":"text/html"
          }
       ],
       "body":"{\"officeId\":1,\"clientId\":909,\"resourceId\":909}"
    },
-   {  
+   {
       "requestId":2,
       "statusCode":200,
-      "headers":[  
-         {  
+      "headers":[
+         {
             "name":"Content-type",
             "value":"text/html"
          }
       ],
       "body":"{\"officeId\":1,\"clientId\":909,\"loanId\":212,\"resourceId\":212}"
    },
-   {  
+   {
       "requestId":3,
       "statusCode":200,
-      "headers":[  
-         {  
+      "headers":[
+         {
             "name":"Content-type",
             "value":"text/html"
          }
       ],
       "body":"{\"officeId\":1,\"clientId\":909,\"loanId\":212,\"resourceId\":155}"
    },
-   {  
+   {
       "requestId":4,
       "statusCode":200,
-      "headers":[  
-         {  
+      "headers":[
+         {
             "name":"Content-type",
             "value":"text/html"
          }
       ],
-      "body":"[   
-	   {   
-	      \"id\":155, 
-	      \"chargeId\":2, 
-	      \"name\":\"Charge_Loans_GEQJC5\", 
-	      \"chargeTimeType\":{   
-	         \"id\":1, 
-	         \"code\":\"chargeTimeType.disbursement\", 
-	         \"value\":\"Disbursement\" 
-	      }, 
-	      \"chargeCalculationType\":{   
-	         \"id\":2, 
-	         \"code\":\"chargeCalculationType.percent.of.amount\", 
-	         \"value\":\"% Amount\" 
-	      }, 
-	      \"percentage\":100.000000, 
-	      \"amountPercentageAppliedTo\":10000.000000, 
-	      \"currency\":{   
-	         \"code\":\"USD\", 
-	         \"name\":\"USDollar\", 
-	         \"decimalPlaces\":2, 
-	         \"displaySymbol\":\"$\", 
-	         \"nameCode\":\"currency.USD\", 
-	         \"displayLabel\":\"US Dollar ($)\" 
-	      }, 
-	      \"amount\":10000.000000, 
-	      \"amountPaid\":0, 
-	      \"amountWaived\":0, 
-	      \"amountWrittenOff\":0, 
-	      \"amountOutstanding\":10000.000000, 
-	      \"amountOrPercentage\":100.000000, 
-	      \"penalty\":false, 
-	      \"chargePaymentMode\":{   
-	         \"id\":0, 
-	         \"code\":\"chargepaymentmode.regular\", 
-	         \"value\":\"Regular\" 
-	      }, 
-	      \"paid\":false, 
-	      \"waived\":false, 
-	      \"chargePayable\":false 
-	   } 
+      "body":"[
+	   {
+	      \"id\":155,
+	      \"chargeId\":2,
+	      \"name\":\"Charge_Loans_GEQJC5\",
+	      \"chargeTimeType\":{
+	         \"id\":1,
+	         \"code\":\"chargeTimeType.disbursement\",
+	         \"value\":\"Disbursement\"
+	      },
+	      \"chargeCalculationType\":{
+	         \"id\":2,
+	         \"code\":\"chargeCalculationType.percent.of.amount\",
+	         \"value\":\"% Amount\"
+	      },
+	      \"percentage\":100.000000,
+	      \"amountPercentageAppliedTo\":10000.000000,
+	      \"currency\":{
+	         \"code\":\"USD\",
+	         \"name\":\"USDollar\",
+	         \"decimalPlaces\":2,
+	         \"displaySymbol\":\"$\",
+	         \"nameCode\":\"currency.USD\",
+	         \"displayLabel\":\"US Dollar ($)\"
+	      },
+	      \"amount\":10000.000000,
+	      \"amountPaid\":0,
+	      \"amountWaived\":0,
+	      \"amountWrittenOff\":0,
+	      \"amountOutstanding\":10000.000000,
+	      \"amountOrPercentage\":100.000000,
+	      \"penalty\":false,
+	      \"chargePaymentMode\":{
+	         \"id\":0,
+	         \"code\":\"chargepaymentmode.regular\",
+	         \"value\":\"Regular\"
+	      },
+	      \"paid\":false,
+	      \"waived\":false,
+	      \"chargePayable\":false
+	   }
 	]"
    }
 ]
 					</code>
-				</div>			
-			
+				</div>
+
 			</div>
 
 			<a class="old-syle-anchor">&nbsp;</a>
@@ -3113,76 +3113,76 @@ POST https://DomainName/api/v1/batches?enclosingTransaction=true
 					<code class="method-request">
 POST batches
 Content-Type: application/json Request Body:
-[  
-  {  
+[
+  {
     "requestId":1,
     "relativeUrl":"clients",
     "method":"POST",
-    "headers":[  
-      {  
+    "headers":[
+      {
         "name":"Content-type",
         "value":"text/html"
       },
-      {  
+      {
         "name":"X-Mifos-Platform-TenantId",
         "value":"text/html"
       }
     ],
-    "body":"{ 
-    	 \"officeId\": 1, 
-    	 \"firstname\": \"Petra\", 
-    	 \"lastname\": \"Yton\", 
-    	 \"externalId\": \"externalId_4\", 
-    	 \"dateFormat\": \"dd MMMM yyyy\", 
-    	 \"locale\": \"en\", \"active\": true, 
-    	 \"activationDate\": \"04 March 2009\", 
-    	 \"submittedOnDate\": \"04 March 2009\" 
+    "body":"{
+    	 \"officeId\": 1,
+    	 \"firstname\": \"Petra\",
+    	 \"lastname\": \"Yton\",
+    	 \"externalId\": \"externalId_4\",
+    	 \"dateFormat\": \"dd MMMM yyyy\",
+    	 \"locale\": \"en\", \"active\": true,
+    	 \"activationDate\": \"04 March 2009\",
+    	 \"submittedOnDate\": \"04 March 2009\"
     	 }"
   },
-  {  
+  {
     "requestId":2,
     "relativeUrl":"savingsaccounts",
     "method":"POST",
     "reference":1,
-    "headers":[  
-      {  
+    "headers":[
+      {
         "name":"Content-type",
         "value":"text/html"
       }
     ],
-    "body":"{   
-              \"clientId\": \"$.clientId\",  
-              \"productId\": 1,  
-              \"locale\": \"en\",   
-              \"dateFormat\": \"dd MMMM yyyy\",   
-              \"submittedOnDate\": \"01 March 2011\"  
+    "body":"{
+              \"clientId\": \"$.clientId\",
+              \"productId\": 1,
+              \"locale\": \"en\",
+              \"dateFormat\": \"dd MMMM yyyy\",
+              \"submittedOnDate\": \"01 March 2011\"
             }"
   }
 ]
 					</code>
 					<code class="method-response">
 Successful transaction response:
-[  
-  {  
+[
+  {
     "requestId":1,
     "statusCode":200,
-    "headers":[  
-      {  
+    "headers":[
+      {
         "name":"Content-type",
         "value":"text/html"
       },
-      {  
+      {
         "name":"X-Mifos-Platform-TenantId",
         "value":"text/html"
       }
     ],
     "body":"{\"officeId\":1,\"clientId\":922,\"resourceId\":922}"
   },
-  {  
+  {
     "requestId":2,
     "statusCode":200,
-    "headers":[  
-      {  
+    "headers":[
+      {
         "name":"Content-type",
         "value":"text/html"
       }
@@ -3192,8 +3192,8 @@ Successful transaction response:
 ]
 					</code>
 
-				</div>			
-			
+				</div>
+
 			</div>
 
 			<a class="old-syle-anchor">&nbsp;</a>
@@ -3202,7 +3202,7 @@ Successful transaction response:
 					<h4>Batch API Errors</h4>
 
 					<p>
-						In Batch API without "enclosingTransaction=true", if one of the response is erroneous, then an appropriate status code will be set for that request and the error message will be returned in it's "body", while all other requests will return successful response with a status code of "200". 
+						In Batch API without "enclosingTransaction=true", if one of the response is erroneous, then an appropriate status code will be set for that request and the error message will be returned in it's "body", while all other requests will return successful response with a status code of "200".
 					</p>
 
 				</div>
@@ -3257,35 +3257,35 @@ Successful transaction response:
 				<div class="method-example">
 <code class="method-response">
 <b>Error Message returned when attempting to create an Office without passing any parameters</b>
-{ 
-"developerMessage": "The request was invalid. This typically will happen due to validation errors which are provided.", 
+{
+"developerMessage": "The request was invalid. This typically will happen due to validation errors which are provided.",
 "developerDocLink": "https://github.com/openMF/mifosx/wiki/HTTP-API-Error-codes",
-"httpStatusCode": "400", 
-"defaultUserMessage": "Validation errors exist.", 
-"userMessageGlobalisationCode": "validation.msg.validation.errors.exist", 
-"errors": [ 
+"httpStatusCode": "400",
+"defaultUserMessage": "Validation errors exist.",
+"userMessageGlobalisationCode": "validation.msg.validation.errors.exist",
+"errors": [
 	{
 	"developerMessage": "The parameter name cannot be blank.",
 	"defaultUserMessage": "The parameter name cannot be blank.",
-	"userMessageGlobalisationCode": "validation.msg.office.name.cannot.be.blank", 
-	"parameterName": "name", 
-	"value": null, 
-	"args": [] 
-	}, 
-	{ 
-	"developerMessage": "The parameter openingDate cannot be blank.", 
+	"userMessageGlobalisationCode": "validation.msg.office.name.cannot.be.blank",
+	"parameterName": "name",
+	"value": null,
+	"args": []
+	},
+	{
+	"developerMessage": "The parameter openingDate cannot be blank.",
 	"defaultUserMessage": "The parameter openingDate cannot be blank.",
 	"userMessageGlobalisationCode": "validation.msg.office.openingDate.cannot.be.blank",
-	"parameterName": "openingDate", "value": null, "args": [] 
-	}, 
+	"parameterName": "openingDate", "value": null, "args": []
+	},
 	{
 	"developerMessage": "The parameter parentId cannot be blank.",
 	"defaultUserMessage": "The parameter parentId cannot be blank.",
 	"userMessageGlobalisationCode":
 	"validation.msg.office.parentId.cannot.be.blank", "parameterName":
 	"parentId", "value": null, "args": []
-	} 
-] 
+	}
+]
 }
 </code>
 				</div>
@@ -3380,7 +3380,7 @@ Successful transaction response:
 							<td>savingsProductId</td>
 						</tr>
 						<tr>
-							<td class=fielddesc>Optional: Default overdraft savings account of client  
+							<td class=fielddesc>Optional: Default overdraft savings account of client
 							</td>
 						</tr>
 					</table>
@@ -3410,13 +3410,13 @@ Successful transaction response:
 						<dd>
 							Boolean <span>optional</span>
 						</dd>
-						<dd>Defaults to false if not provided. If <strong>staffInSelectedOfficeOnly=true</strong> only staff 
-						who are associated with the selected branch are returned.</dd>	
+						<dd>Defaults to false if not provided. If <strong>staffInSelectedOfficeOnly=true</strong> only staff
+						who are associated with the selected branch are returned.</dd>
 						<dt>commandParam</dt>
 						<dd>
 							String <span>optional</span>
 						</dd>
-						<dd>If <strong>commandParam=close</strong> retrieves all closureReasons which are associated with 
+						<dd>If <strong>commandParam=close</strong> retrieves all closureReasons which are associated with
 						<strong>"ClientClosureReason"</strong> value.</dd>
 					</dl>
 					<p>Example Request:</p>
@@ -3492,18 +3492,18 @@ POST https://DomainName/api/v1/clients
 					<code class="method-request">
 POST clients
 Content-Type: application/json Request Body:
-{ 
-	"officeId": 1, 
-	"firstname": "Petra", 
-	"lastname": "Yton", 
-	"externalId": "786YYH7", 
-	"dateFormat": "dd MMMM yyyy", 
-	"locale": "en", 
+{
+	"officeId": 1,
+	"firstname": "Petra",
+	"lastname": "Yton",
+	"externalId": "786YYH7",
+	"dateFormat": "dd MMMM yyyy",
+	"locale": "en",
 	"active": true,
 	"activationDate": "04 March 2009",
     "submittedOnDate":"04 March 2009",
     "savingsProductId" : 4
-} 
+}
 					</code>
 					<code class="method-response">
 {
@@ -3517,14 +3517,14 @@ Content-Type: application/json Request Body:
 				<div class="method-example">
 					<code class="method-request">
 POST clients
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
-{ 
-	"officeId": 1, 
+{
+	"officeId": 1,
 	"fullname": "Client of group",
 	"groupId": 1,
-	"dateFormat": "dd MMMM yyyy", 
-	"locale": "en", 
+	"dateFormat": "dd MMMM yyyy",
+	"locale": "en",
 	"active": true,
 	"activationDate": "04 March 2009"
 }
@@ -3567,7 +3567,7 @@ Request Body:
 	        </code>
 	    </div>
 	</div>
-	
+
 	<a id="clients_close" name="clients_close" class="old-syle-anchor">&nbsp;</a>
 	<div class="method-section">
 	    <div class="method-description">
@@ -3585,17 +3585,17 @@ Request Body:
   "locale":"en",
   "closureDate":"25 June 2013",
   "closureReasonId":"11"
-}				
+}
 			</code>
 	        <code class="method-response">
-{ 
+{
   "clientId":15,
   "resourceId":15
 }
 	        </code>
 	    </div>
 	</div>
-	
+
 	<a id="clients_reject" name="clients_reject" class="old-syle-anchor">&nbsp;</a>
 	<div class="method-section">
 	    <div class="method-description">
@@ -3612,7 +3612,7 @@ Request Body:
 				</tr>
 			</table>
 	    </div>
-	    
+
 		<div class="method-example">
 	        <code class="method-declaration">POST https://Domain Name/api/v1/clients/{clientId}?command=reject</code>
 	        <code class="method-request">POST clients/1?command=reject
@@ -3623,17 +3623,17 @@ Request Body:
 "rejectionReasonId":16,
 "locale":"en",
 "dateFormat":"dd MMMM yyyy"
-}			
+}
 			</code>
 	        <code class="method-response">
-{ 
+{
   "clientId":15,
   "resourceId":15
 }
 	        </code>
 	    </div>
 	</div>
-	
+
 	<a id="clients_withdraw" name="clients_withdraw" class="old-syle-anchor">&nbsp;</a>
 	<div class="method-section">
 	    <div class="method-description">
@@ -3660,10 +3660,10 @@ Request Body:
 "withdrawalReasonId":17,
 "locale":"en",
 "dateFormat":"dd MMMM yyyy"
-}			
+}
 			</code>
 	        <code class="method-response">
-{ 
+{
   "officeId":1,
   "clientId":15,
   "resourceId":15
@@ -3671,8 +3671,8 @@ Request Body:
 	        </code>
 	    </div>
 	</div>
-	
-	
+
+
 	<a id="clients_reactivate" name="clients_reactivate" class="old-syle-anchor">&nbsp;</a>
 	<div class="method-section">
 	    <div class="method-description">
@@ -3698,10 +3698,10 @@ Request Body:
 "reactivationDate":"28 November 2014",
 "locale":"en",
 "dateFormat":"dd MMMM yyyy"
-}			
+}
 			</code>
 	        <code class="method-response">
-{ 
+{
 
   "clientId":15,
   "resourceId":15
@@ -3714,7 +3714,7 @@ Request Body:
 	    <div class="method-description">
 	        <h4>Assign a Staff</h4>
 	        <p>Allows you to assign a <i>Staff</i> for existed Client.</p>
-	        <p>The selected Staff should belong to the same office (or an officer higher up in the hierarchy) 
+	        <p>The selected Staff should belong to the same office (or an officer higher up in the hierarchy)
 	        as the Client he manages.</p>
 	    </div>
 	    <div class="method-example">
@@ -3736,7 +3736,7 @@ Request Body:
 	        </code>
 	    </div>
 	</div>
-	
+
 	<a id="clients_unassignStaff" name="clients_unassignStaff" class="old-syle-anchor">&nbsp;</a>
 	<div class="method-section">
 	    <div class="method-description">
@@ -3750,10 +3750,10 @@ Content-Type: application/json
 Request Body:
 {
   "staffId":"1"
-}				
+}
 			</code>
 	        <code class="method-response">
-{ 
+{
   "officeId": 1,
   "clientId": 1,
   "resourceId": 1,
@@ -3806,7 +3806,7 @@ Request Body:
 {
   "destinationOfficeId":"2",
   "note":"Client Relocating to Bangalore"
-}				
+}
 			</code>
 	        <code class="method-response">
 {
@@ -3824,7 +3824,7 @@ Request Body:
 	    <div class="method-description">
 	        <h4>Withdraw a Client Transfer</h4>
 	        <p>Allows you to withdraw the proposed transfer of a <i>Client</i> to a different <i>Office</i>.</p>
-	        <p>Withdrawal can happen only if the destination Branch (to which the transfer was 
+	        <p>Withdrawal can happen only if the destination Branch (to which the transfer was
 	        <a href="#clients_propose_transfer">proposed</a>) has not already
 	         <a href="#clients_accept_transfer">accepted</a> the transfer proposal </p>
 	    </div>
@@ -3835,7 +3835,7 @@ Content-Type: application/json
 Request Body:
 {
 	"note":"Sorry, data entry error"
-}			
+}
 			</code>
 	        <code class="method-response">
 {
@@ -3861,7 +3861,7 @@ Content-Type: application/json
 Request Body:
 {
 	"note":"We cannot accept tranfers of clients having loans with less than 1 repayment left"
-}			
+}
 			</code>
 	        <code class="method-response">
 {
@@ -3872,7 +3872,7 @@ Request Body:
 
 	        </code>
 	    </div>
-	</div>	
+	</div>
 
 	<a id="clients_accept_transfer" name="clients_accept_transfer" class="old-syle-anchor">&nbsp;</a>
 	<div class="method-section">
@@ -3891,7 +3891,7 @@ Request Body:
    "destinationGroupId":"13",
    "staffId":"1",
    "note":"Due Diligence done and all documents received"
-}			
+}
 			</code>
 	        <code class="method-response">
 {
@@ -3922,7 +3922,7 @@ Request Body:
   "destinationGroupId":"13",
   "staffId":"1",
   "note":"Client Relocating to Bangalore"
-}				
+}
 			</code>
 	        <code class="method-response">
 {
@@ -3933,7 +3933,7 @@ Request Body:
 
 	        </code>
 	    </div>
-	</div>			
+	</div>
 
 
 			<a id="clients_retrieve" name="clients_retrieve" class="old-syle-anchor">&nbsp;</a>
@@ -4011,7 +4011,7 @@ GET https://DomainName/api/v1/clients/{clientId}
 							Integer <span>optional</span>, defaults to 0
 						</dd>
 						<dd>Indicates the result from which pagination starts</dd>
-						
+
 						<dt>limit</dt>
 						<dd>
 							Integer <span>optional</span>, defaults to 200
@@ -4032,7 +4032,7 @@ GET https://DomainName/api/v1/clients/{clientId}
 
 						<dt>officeId</dt>
 						<dd>
-							Integer <span>optional</span> 
+							Integer <span>optional</span>
 						</dd>
 						<dd>Provides the ability to restrict list of clients returned based on the office they are associated with.</dd>
 						<dt>underHierarchy</dt>
@@ -4069,7 +4069,7 @@ GET https://DomainName/api/v1/clients/{clientId}
 						<dd>
 							String <span>optional</span>
 						</dd>
-						<dd>Use an sql fragment valid for the underlying client schema to filter results. e.g. display_name like %K%</dd>				
+						<dd>Use an sql fragment valid for the underlying client schema to filter results. e.g. display_name like %K%</dd>
 					</dl>
 					<p>Example Requests:</p>
 					<div class=apiClick>clients</div>
@@ -4140,8 +4140,8 @@ GET https://DomainName/api/v1/clients
 PUT https://DomainName/api/v1/clients/{clientId}
 						</code>
 					<code class="method-request">
-PUT clients/1 
-Content-Type: application/json 
+PUT clients/1
+Content-Type: application/json
 Request Body:
 {
     "externalId": "786444UUUYYH7"
@@ -4172,7 +4172,7 @@ DELETE https://DomainName/api/v1/clients/{clientId}
 						</code>
 					<code class="method-request">
 DELETE clients/3
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 }
@@ -4323,9 +4323,9 @@ GET https://DomainName/api/v1/clients/{clientId}/accounts
 			<div class="method-section">
 				<div class="method-description">
 					<h3>Client Identifiers</h3>
-					<p>Client Identifiers refer to documents that are 
+					<p>Client Identifiers refer to documents that are
 					used to uniquely identify a customer <br/>
-					Ex: Drivers License, Passport, Ration card etc 
+					Ex: Drivers License, Passport, Ration card etc
 					</p>
 					<table class=matrixHeading>
 						<tr class="matrixHeadingBG">
@@ -4342,14 +4342,14 @@ GET https://DomainName/api/v1/clients/{clientId}/accounts
 							<td>documentType</td>
 						</tr>
 						<tr>
-							<td class=fielddesc>Type of the identification document 
+							<td class=fielddesc>Type of the identification document
 								(License, Passport Etc)</td>
 						</tr>
 						<tr class=alt>
 							<td>description</td>
 						</tr>
 						<tr>
-							<td class=fielddesc>Any user comments to be associated 
+							<td class=fielddesc>Any user comments to be associated
 								with the Client Identifier</td>
 						</tr>
 					</table>
@@ -4491,7 +4491,7 @@ POST https://DomainName/api/v1/clients/{clientId}/identifiers
 					</code>
 					<code class="method-request">
 POST clients/1/identifiers
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 "documentTypeId":"1",
@@ -4519,8 +4519,8 @@ Request Body:
 PUT https://DomainName/api/v1/clients/{clientId}/identifiers/{identifierId}
 					</code>
 					<code class="method-request">
-PUT clients/1/identifiers/3 
-Content-Type: application/json 
+PUT clients/1/identifiers/3
+Content-Type: application/json
 Request Body:
 {
 "documentTypeId":"4",
@@ -4553,8 +4553,8 @@ Request Body:
 DELETE https://DomainName/api/v1/clients/{clientId}/identifiers/{identifierId}
 					</code>
 					<code class="method-request">
-DELETE clients/1/identifiers/3 
-Content-Type: application/json 
+DELETE clients/1/identifiers/3
+Content-Type: application/json
 No Request Body:
 					</code>
 					<code class="method-response">
@@ -4573,9 +4573,9 @@ No Request Body:
 			<div class="method-section">
 				<div class="method-description">
 					<h3>Client Images</h3>
-					<p>The current API provides support for the addition of a single 
+					<p>The current API provides support for the addition of a single
 					image for a Client<br/>
-					Allowed formats: JPEG (.jpg or .jpeg), GIF (.gif) and PNG (.png) 
+					Allowed formats: JPEG (.jpg or .jpeg), GIF (.gif) and PNG (.png)
 					</p>
 					<p> The API supports two different Approaches for manipulating Client Images
 					 <ul>
@@ -4584,7 +4584,7 @@ No Request Body:
 					 	</li>
 					 	<li><a href="http://www.w3.org/TR/html401/interact/forms.html#h-17.13.4.2">
 						Multi-part form data:</a>
-					  Images can be uploaded using Multi part forms and downloaded as regular binary files 
+					  Images can be uploaded using Multi part forms and downloaded as regular binary files
 					 	</li>
 					 <br/>
 				</div>
@@ -4603,7 +4603,7 @@ No Request Body:
 				<div class="method-example">
 					<code class="method-declaration">
 GET https://DomainName/api/v1/clients/{clientId}/images
-Accept: text/plain 
+Accept: text/plain
 
 					</code>
 					<code class="method-response">
@@ -4636,16 +4636,16 @@ gAEAOg13B6R/SAgAAAAASUVORK5CYII=
 							Integer <span>optional</span>
 						</dd>
 						<dd>Triggers resizing of the image to the defined width</dd>
-						
+
 						<dt>maxHeight</dt>
 						<dd>
 						<dd>
 							Integer <span>optional</span>
-						</dd>	
+						</dd>
 						</dd>
 						<dd>Triggers resizing of the image to the defined height</dd>
 
-									
+
 					</dl>
 				</div>
 				<div class="method-example">
@@ -4655,7 +4655,7 @@ Accept: application/octet-stream
 					</code>
 					<code class="method-request">
 POST clients/1/images
-Accept: application/octet-stream 
+Accept: application/octet-stream
 					</code>
 					<code class="method-response">
 <i>Not shown</i>: The corresponding binary (image) file
@@ -4674,7 +4674,7 @@ POST https://DomainName/api/v1/clients/{clientId}/images
 					</code>
 					<code class="method-request">
 POST clients/1/images
-Content-Type: text/plain 
+Content-Type: text/plain
 Request Body:
 data:image/png;base64,iVBORw0KGgoAA
 AANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0l
@@ -4705,10 +4705,10 @@ P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC
 						</tr>
 					</table>
 					<p>
-						The form should contain a required named body part with the 
-						name "file". <br/> <br/> 
-						If you are using a HTML form, a snippet like 
-						<small> &lt;input type="file" name="file"&gt;&lt;/input&gt; </small> 
+						The form should contain a required named body part with the
+						name "file". <br/> <br/>
+						If you are using a HTML form, a snippet like
+						<small> &lt;input type="file" name="file"&gt;&lt;/input&gt; </small>
 						can be used for uploading the image file
 					</p>
 				</div>
@@ -4718,7 +4718,7 @@ POST https://DomainName/api/v1/clients/{clientId}/images
 					</code>
 					<code class="method-request">
 POST clients/1/images
-Content-Type: multipart/form-data 
+Content-Type: multipart/form-data
 Request Body: <i>Not shown</i>
 					</code>
 					<code class="method-response">
@@ -4742,7 +4742,7 @@ PUT https://DomainName/api/v1/clients/{clientId}/images
 					</code>
 					<code class="method-request">
 PUT clients/1/images
-Content-Type: text/plain 
+Content-Type: text/plain
 Request Body:
 data:image/png;base64,iVBORw0KGgoAA
 AANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0l
@@ -4773,10 +4773,10 @@ P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC
 						</tr>
 					</table>
 					<p>
-						The form should contain a required named body part with the 
-						name "file". <br/> <br/> 
-						If you are using a HTML form, a snippet like 
-						<small> &lt;input type="file" name="file"&gt;&lt;/input&gt; </small> 
+						The form should contain a required named body part with the
+						name "file". <br/> <br/>
+						If you are using a HTML form, a snippet like
+						<small> &lt;input type="file" name="file"&gt;&lt;/input&gt; </small>
 						can be used for uploading the image file
 					</p>
 				</div>
@@ -4786,7 +4786,7 @@ PUT https://DomainName/api/v1/clients/{clientId}/images
 					</code>
 					<code class="method-request">
 PUT clients/1/images
-Content-Type: multipart/form-data 
+Content-Type: multipart/form-data
 Request Body: <i>Not shown</i>
 					</code>
 				</div>
@@ -4803,7 +4803,7 @@ DELETE https://DomainName/api/v1/clients/{clientId}/images
 					</code>
 					<code class="method-request">
 DELETE clients/1/images
-Content-Type: application/json 
+Content-Type: application/json
 No Request Body:
 					</code>
 					<code class="method-response">
@@ -5007,8 +5007,8 @@ POST https://DomainName/mifosng-provider/api/v1/centers
 POST centers
 Content-Type: application/json Request Body:
 {
- 	"name": "First Center (No groups)", 
- 	"officeId": 1, 
+ 	"name": "First Center (No groups)",
+ 	"officeId": 1,
  	"active": false
 }
 					</code>
@@ -5338,7 +5338,7 @@ Request Body:
             <div class="method-section">
                 <div class="method-description">
                     <h4>Save Collection Sheet</h4>
-                    <p>This Api allows the loan officer to perform bulk repayments of JLG loans for a center on a given meeting date.</p>      
+                    <p>This Api allows the loan officer to perform bulk repayments of JLG loans for a center on a given meeting date.</p>
                 </div>
                 <div class="method-example">
                     <code class="method-declaration">POST https://Domain Name/api/v1/centers/{centerId}?command=saveCollectionSheet</code>
@@ -5373,7 +5373,7 @@ Request Body:
 }
                     </code>
                 </div>
-            </div>      
+            </div>
 
 			<a id="centers_update" name="centers_update" class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
@@ -5386,7 +5386,7 @@ PUT https://DomainName/mifosng-provider/api/v1/centers/{centerId}
 						</code>
 					<code class="method-request">
 PUT centers/8
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 	"name": "First Center (No groups)"
@@ -5404,7 +5404,7 @@ Request Body:
 					</code>
 				</div>
 			</div>
-			
+
 			<a id="centers_delete" name="centers_delete" class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
 				<div class="method-description">
@@ -5502,7 +5502,7 @@ GET https://DomainName/mifosng-provider/api/v1/centers/9
 							Integer <span>optional</span>, defaults to 0
 						</dd>
 						<dd>Indicates from what result to start from.</dd>
-						
+
 						<dt>limit</dt>
 						<dd>
 							Integer <span>optional</span>, defaults to 200
@@ -5523,7 +5523,7 @@ GET https://DomainName/mifosng-provider/api/v1/centers/9
 
 						<dt>officeId</dt>
 						<dd>
-							Integer <span>optional</span> 
+							Integer <span>optional</span>
 						</dd>
 						<dd>Provides ability to restrict list of centers returned based on the office there associated with.</dd>
 						<dt>underHierarchy</dt>
@@ -5548,7 +5548,7 @@ GET https://DomainName/mifosng-provider/api/v1/centers/9
 						<dd>
 							String <span>optional</span>
 						</dd>
-						<dd>Use an sql fragment valid for the underlying center schema to filter results. e.g. display_name like %K%</dd>				
+						<dd>Use an sql fragment valid for the underlying center schema to filter results. e.g. display_name like %K%</dd>
 					</dl>
 					<p>Example Requests:</p>
 					<div class=apiClick>centers</div>
@@ -5730,10 +5730,10 @@ GET https://DomainName/mifosng-provider/api/v1/centers?paged=true
 						<dd>
 							Boolean <span>optional</span>
 						</dd>
-						<dd>Defaults to false if not provided. If <strong>staffInSelectedOfficeOnly=true</strong> only staff 
-						who are associated with the selected branch are returned.</dd>	
+						<dd>Defaults to false if not provided. If <strong>staffInSelectedOfficeOnly=true</strong> only staff
+						who are associated with the selected branch are returned.</dd>
 					</dl>
-					
+
 					<p>Example Requests:</p>
 					<div class=apiClick>groups/template</div>
 					<br/>
@@ -5863,7 +5863,7 @@ Content-Type: application/json Request Body:
 {
 	"officeId":"1",
 	"name":"Pending Group",
-	"active": false 
+	"active": false
 }
 					</code>
 					<code class="method-response">
@@ -5877,13 +5877,13 @@ Content-Type: application/json Request Body:
 POST groups
 Content-Type: application/json Request Body:
 {
-	"officeId":"1", 
+	"officeId":"1",
 	"name":"First Group",
-	"externalId": "000-1A", 
+	"externalId": "000-1A",
 	"clientMembers": ["1"],
-	"dateFormat": "dd MMMM yyyy", 
-	"locale": "en", 
-	"active": true, 
+	"dateFormat": "dd MMMM yyyy",
+	"locale": "en",
+	"active": true,
 	"activationDate": "04 March 2009",
       "submittedOnDate":"04 March 2009"
 }
@@ -6475,8 +6475,8 @@ Request Body:
                         <dd>
                             Boolean <span>optional</span>, defaults to false
                         </dd>
-                        <dd>If <strong>staffInSelectedOfficeOnly=true</strong> only staff 
-                        who are associated with the selected branch are returned.</dd>  
+                        <dd>If <strong>staffInSelectedOfficeOnly=true</strong> only staff
+                        who are associated with the selected branch are returned.</dd>
                         <dt>roleId</dt>
                         <dd>
                             Long <span>optional</span>
@@ -6796,7 +6796,7 @@ PUT https://DomainName/mifosng-provider/api/v1/groups/{groupid}
 						</code>
 					<code class="method-request">
 PUT groups/1
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 	"name": "First Group (changed)"
@@ -6855,7 +6855,7 @@ DELETE groups/2
 							Integer <span>optional</span>, defaults to 0
 						</dd>
 						<dd>Indicates from what result to start from.</dd>
-						
+
 						<dt>limit</dt>
 						<dd>
 							Integer <span>optional</span>, defaults to 200
@@ -6876,7 +6876,7 @@ DELETE groups/2
 
 						<dt>officeId</dt>
 						<dd>
-							Integer <span>optional</span> 
+							Integer <span>optional</span>
 						</dd>
 						<dd>Provides ability to restrict list of groups returned based on the office there associated with.</dd>
 						<dt>underHierarchy</dt>
@@ -6901,7 +6901,7 @@ DELETE groups/2
 						<dd>
 							String <span>optional</span>
 						</dd>
-						<dd>Use an sql fragment valid for the underlying group schema to filter results. e.g. display_name like %K%</dd>				
+						<dd>Use an sql fragment valid for the underlying group schema to filter results. e.g. display_name like %K%</dd>
 					</dl>
 					<p>Example Requests:</p>
 					<div class=apiClick>groups</div>
@@ -7145,7 +7145,7 @@ GET https://DomainName/mifosng-provider/api/v1/groups?paged=true
 <tr>
 	<td class=fielddesc>
 An enumeration that indicates the type of transaction processing strategy to be used. This relates to functionality that is also known as <b>Payment Application Logic</b>.
-	
+
 <p>A number of out of the box approaches exist, some are custom to specific MFIs, some are more general and indicate the order in which payments are processed.</p>
 
 <p>Refer to the <a href="#paymentapplicationlogic">Payment Application Logic / Transaction Processing Strategy<a> section in the appendix for more detailed overview of each available <b>payment application logic</b> provided out of the box.</p>
@@ -7237,12 +7237,12 @@ An enumeration that indicates the type of transaction processing strategy to be
 						</dd>
 						<dd>If entered, productId, productName and selectedProduct
 							fields are returned.</dd>
-							
+
 						<dt>staffInSelectedOfficeOnly</dt>
 						<dd>
 							Boolean <span>optional</span>
 						</dd>
-						<dd>Defaults to false if not provided. If <strong>staffInSelectedOfficeOnly=true</strong> only loan officers 
+						<dd>Defaults to false if not provided. If <strong>staffInSelectedOfficeOnly=true</strong> only loan officers
 						who are associated with the selected branch are returned.</dd>
 						<dt>activeOnly</dt>
 						<dd>
@@ -7600,7 +7600,7 @@ GET https://DomainName/api/v1/loans/template?templateType=individual&clientId=1&
 							<b>'originalSchedule':</b> Loan schedule data without interest recalculations.
 						</dd>
 						<dd>
-							<b>'futureSchedule':</b> Loan schedule data from today date(will be displayed only for interest first repayment strategy processors) 
+							<b>'futureSchedule':</b> Loan schedule data from today date(will be displayed only for interest first repayment strategy processors)
 						</dd>
 						<dd>
 							<b>'transactions':</b> Loan transactions data.
@@ -7864,7 +7864,7 @@ GET https://DomainName/api/v1/loans/{loanId}
 							Integer <span>optional</span>, defaults to 0
 						</dd>
 						<dd>Indicates from what result to start from.</dd>
-						
+
 						<dt>limit</dt>
 						<dd>
 							Integer <span>optional</span>, defaults to 200
@@ -7885,10 +7885,10 @@ GET https://DomainName/api/v1/loans/{loanId}
 
 						<dt>officeId</dt>
 						<dd>
-							Integer <span>optional</span> 
+							Integer <span>optional</span>
 						</dd>
 						<dd>Provides ability to restrict list of loans returned based on the office there associated with.</dd>
-						
+
 						<dt>underHierarchy</dt>
 						<dd>
 							String <span>optional</span>
@@ -7911,7 +7911,7 @@ GET https://DomainName/api/v1/loans/{loanId}
 						<dd>
 							String <span>optional</span>
 						</dd>
-						<dd>Use an sql fragment valid for the underlying loan schema to filter results. e.g. display_name like %K%</dd>				
+						<dd>Use an sql fragment valid for the underlying loan schema to filter results. e.g. display_name like %K%</dd>
 					</dl>
 					<p>Example Requests:</p>
 					<div class=apiClick>loans</div>
@@ -8107,7 +8107,7 @@ GET https://DomainName/mifosng-provider/api/v1/loans
 				</div>
 				<div class="method-example">
 					<code class="method-declaration">PUT https://Domain Name/api/v1/loans/{loanId}</code>
-					<code class="method-request">PUT loans/1              
+					<code class="method-request">PUT loans/1
 Content-Type: application/json
 No Request Body:
 {
@@ -8167,7 +8167,7 @@ POST https://DomainName/api/v1/loans?command=calculateLoanSchedule
 					</code>
 					<code class="method-request">
 POST loans?command=calculateLoanSchedule
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
     "dateFormat": "dd MMMM yyyy",
@@ -8337,7 +8337,7 @@ POST https://DomainName/api/v1/loans
 					</code>
 					<code class="method-request">
 POST loans
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
     "dateFormat": "dd MMMM yyyy",
@@ -8404,7 +8404,7 @@ POST https://DomainName/api/v1/loans/{loanId}?command=approve
 					</code>
 					<code class="method-request">
 POST loans/1?command=approve
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
     "locale": "en",
@@ -8443,7 +8443,7 @@ Request Body:
 				</div>
 			</div>
 
-			
+
 			<a id="loans_recoverguarantee" name="loans_recoverguarantee" class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
 				<div class="method-description">
@@ -8455,12 +8455,12 @@ POST https://DomainName/api/v1/loans/{loanId}?command=recoverGuarantees
 					</code>
 					<code class="method-request">
 POST loans/1?command=approve
-Content-Type: application/json 
+Content-Type: application/json
 No Request Body:
 </code>
 					<code class="method-response">
 {
-  
+
   "loanId": 1
 }
 					</code>
@@ -8540,7 +8540,7 @@ Request Body:
 	        </code>
 	    </div>
 	</div>
-	
+
 	<a id="loans_unassignLoanOfficer" name="loans_unassignLoanOfficer" class="old-syle-anchor">&nbsp;</a>
 	<div class="method-section">
 	    <div class="method-description">
@@ -8556,7 +8556,7 @@ Request Body:
 	"unassignedDate":"15 September 2014",
 	"locale":"en",
 	"dateFormat":"dd MMMM yyyy"
-}				
+}
 			</code>
 	        <code class="method-response">
 {
@@ -8588,7 +8588,7 @@ POST https://DomainName/api/v1/loans/{loanId}?command=reject
 					</code>
 					<code class="method-request">
 POST loans/1?command=reject
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
     "locale": "en",
@@ -8646,7 +8646,7 @@ POST https://DomainName/api/v1/loans/{loanId}?command=withdrawnByApplicant
 					</code>
 					<code class="method-request">
 POST loans/1?command=withdrawnByApplicant
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
     "locale": "en",
@@ -8713,7 +8713,7 @@ POST https://DomainName/api/v1/loans/{loanId}?command=disburse
 					</code>
 					<code class="method-request">
 POST loans/1?command=disburse
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
   "dateFormat": "dd MMMM yyyy",
@@ -8793,7 +8793,7 @@ POST https://DomainName/api/v1/loans/{loanId}?command=disburseToSavings
 					</code>
 					<code class="method-request">
 POST loans/1?command=disburse
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
   "dateFormat": "dd MMMM yyyy",
@@ -8891,7 +8891,7 @@ DELETE https://DomainName/api/v1/loans/{loanId}
 					</code>
 					<code class="method-request">
 DELETE loans/1
-Content-Type: application/json 
+Content-Type: application/json
 No Request Body:
 					</code>
 					<code class="method-response">
@@ -8963,7 +8963,7 @@ No Request Body:
 							loan's inArrearsTolerance
 						</dd>
 						<dd>
-							<b>'refundbycash'</b><br> "date" is set to the current date <br> 
+							<b>'refundbycash'</b><br> "date" is set to the current date <br>
 							"total" "amount" is set
 							to the total amount paid in advance.
 						</dd>
@@ -9053,7 +9053,7 @@ Request Body:
 					</code>
 				</div>
 			</div>
-			
+
 			<a id="loans_transaction_refund_by_cash" name="loans_transaction_refund_by_cash" class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
 				<div class="method-description">
@@ -9237,9 +9237,9 @@ Request Body:
 				</div>
 			</div>
 
-        
+
 		<!--- end of recovery payment -->
-		
+
             <a id="loans_transaction_undo_write-off_loan" name="loans_transaction_undo_write-off_loan" class="old-syle-anchor">&nbsp;</a>
             <div class="method-section">
                 <div class="method-description">
@@ -9256,7 +9256,7 @@ Request Body:
                         { }
                     </code>
                     <code class="method-response">
-		      
+
 		        {
 		          "officeId": 1,
 		          "clientId": 1,
@@ -9313,7 +9313,7 @@ GET https://DomainName/api/v1/loans/{loanId}/transactions/{transactionId}
 					</code>
 				</div>
 			</div>
-			
+
 			<a id="loans_transaction_adjust" name="loans_transaction_adjust" class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
 				<div class="method-description">
@@ -9334,7 +9334,7 @@ POST https://DomainName/api/v1/loans/{loanId}/transactions/{transactionId}
 					</code>
 					<code class="method-request">
 POST loans/1/transactions/2
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
     "locale": "en_GB",
@@ -9345,13 +9345,13 @@ Request Body:
 }
 					</code>
 					<code class="method-response">
-{ 
+{
 	"resourceId": 16
 }
 					</code>
 				</div>
 			</div>
-			
+
 			<!--Start of guarantors functionality-->
 
 			<a id="guarantors" name="guarantors" class="old-syle-anchor">&nbsp;</a>
@@ -9359,7 +9359,7 @@ Request Body:
 				<div class="method-description">
 					<h3>Guarantors</h3>
 					<p>A person who guarantees to pay for someone else's debt
-					if he or she should default on a loan obligation. A guarantor acts as a co-signor of sorts.                   
+					if he or she should default on a loan obligation. A guarantor acts as a co-signor of sorts.
 					</p>
 					<table class=matrixHeading>
 						<tr class="matrixHeadingBG">
@@ -9420,7 +9420,7 @@ Request Body:
 							<td>savingsId</td>
 						</tr>
 						<tr>
-							<td class=fielddesc>Guarantors Savings Account on which Amount will be blocked 
+							<td class=fielddesc>Guarantors Savings Account on which Amount will be blocked
 							</td>
 						</tr>
 						<tr class=alt>
@@ -9636,7 +9636,7 @@ POST https://DomainName/api/v1//loans/{loanId}}/guarantors
                     </code>
                     <code class="method-request">
 POST /loans/1/guarantors
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
   guarantorTypeId:3,
@@ -9653,7 +9653,7 @@ Request Body:
                     </code>
                     <code class="method-request">
 POST /loans/1/guarantors
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
   guarantorTypeId:1,
@@ -9682,8 +9682,8 @@ PUT https://DomainName/api/v1/loans/{loanId}/guarantors/{guarantorId}
 					</code>
 					<code class="method-request">
 PUT loans/1/guarantors/1
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
   entityId:1
 }
@@ -9717,7 +9717,7 @@ DELETE https://DomainName/api/v1/loans/{loanId}/guarantors/{guarantorId}?guarant
 					<code class="method-request">
 DELETE loans/1/guarantors/1
 DELETE loans/1/guarantors/1?guarantorFundingId=1
-Content-Type: application/json 
+Content-Type: application/json
 No Request Body:
 					</code>
 					<code class="method-response">
@@ -9734,12 +9734,12 @@ No Request Body:
 			<div class="method-section">
 				<div class="method-description">
 					<h3> Loan Collateral</h3>
-					<p>In lending agreements, collateral is a borrower's pledge of specific property to a lender, 
-					to secure repayment of a loan. The collateral serves as protection for a lender against a 
+					<p>In lending agreements, collateral is a borrower's pledge of specific property to a lender,
+					to secure repayment of a loan. The collateral serves as protection for a lender against a
 					borrower's default - that is, any borrower failing to pay the principal and interest under
-					the terms of a loan obligation. If a borrower does default on a loan (due to insolvency 
-					or other event), that borrower forfeits (gives up) the property pledged as collateral 
-					- and the lender then becomes the owner of the collateral                   
+					the terms of a loan obligation. If a borrower does default on a loan (due to insolvency
+					or other event), that borrower forfeits (gives up) the property pledged as collateral
+					- and the lender then becomes the owner of the collateral
 					</p>
 					<table class=matrixHeading>
 						<tr class="matrixHeadingBG">
@@ -9750,8 +9750,8 @@ No Request Body:
 						</tr>
 						<tr>
 							<td class=fielddesc>Identifies the type of a collateral <br/>
-							Ex: Gold, property etc (permitted types can be configured using 
-							<a href="#configs_codes_codevalues">Code Values</a> for 
+							Ex: Gold, property etc (permitted types can be configured using
+							<a href="#configs_codes_codevalues">Code Values</a> for
 							the <a href="#configs_codes">Code</a> <i>LoanCollateral</i>) <br/>
 							Refer <a href="#collaterals_template">Retrieve
 							Collateral Details Template</a> for complete
@@ -9778,8 +9778,8 @@ No Request Body:
 						<tr>
 							<td class=fielddesc>Details of the currency used
 								to estimate the value of a Collateral.
-								The currency defaults to the currency of the 
-								Loan for which this Collateral serves as a 
+								The currency defaults to the currency of the
+								Loan for which this Collateral serves as a
 								guarantee
 							</td>
 						</tr>
@@ -9931,7 +9931,7 @@ POST https://DomainName/api/v1//loans/{loanId}/collaterals
                     </code>
                     <code class="method-request">
 POST /loans/1/collaterals
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
   collateralTypeId:9,
@@ -9945,7 +9945,7 @@ Request Body:
                     </code>
                     <code class="method-request">
 POST /loans/1/collaterals
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 	"collateralTypeId":"8",
@@ -9976,9 +9976,9 @@ PUT https://DomainName/api/v1/loans/{loanId}/collaterals/{collateralId}
 					</code>
 					<code class="method-request">
 PUT loans/1/collaterals/12
-Content-Type: application/json 
-Request Body: 
-{ 
+Content-Type: application/json
+Request Body:
+{
 "description": "22 Carat Gold chain weighing 12 grams"
 }
 					</code>
@@ -10008,7 +10008,7 @@ DELETE https://DomainName/api/v1/loans/{loanId}/collaterals/{collateralId}
 					</code>
 					<code class="method-request">
 DELETE loans/1/collaterals/13
-Content-Type: application/json 
+Content-Type: application/json
 No Request Body:
 					</code>
 					<code class="method-response">
@@ -10027,10 +10027,10 @@ No Request Body:
 					<h3>Loan Charges</h3>
 					<p>Its typical for MFIs to add extra costs for their loan products. They
 					can be either Fees or Penalties.</p>
-					<p>Loan Charges are instances of <a href="#charges">Charges</a> and 
+					<p>Loan Charges are instances of <a href="#charges">Charges</a> and
 						represent either fees and penalties for loan products. Refer <a href="#charges">Charges</a>
 						for documentation of the various properties of a charge, Only additional properties (
-						specific to the context of a Charge being associated with a Loan) are 
+						specific to the context of a Charge being associated with a Loan) are
 						described here</p>
 					<table class=matrixHeading>
 						<tr class="matrixHeadingBG">
@@ -10354,7 +10354,7 @@ POST https://DomainName/api/v1/loans/{loanId}/charges
                     </code>
                     <code class="method-request">
 POST /loans/1/charges
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
   "chargeId": "2",
@@ -10380,7 +10380,7 @@ Request Body:
 			<div class="method-section">
 				<div class="method-description">
 					<h4>Update a Loan Charge</h4>
-					<p>Currently Loan Charges may be updated only if the Loan 
+					<p>Currently Loan Charges may be updated only if the Loan
 						is not yet approved
 					</p>
 				</div>
@@ -10390,8 +10390,8 @@ PUT https://DomainName/api/v1/loans/{loanId}/charges/{chargeId}
 					</code>
 					<code class="method-request">
 PUT loans/1/charges/12
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
   "dateFormat": "dd MMMM yyyy",
   "locale": "en",
@@ -10430,8 +10430,8 @@ POST https://DomainName/api/v1/loans/{loanId}/charges/{chargeId}?command=pay
 					</code>
 					<code class="method-request">
 POST loans/1/charges/12?command=pay
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
   "dateFormat": "dd MMMM yyyy",
   "locale": "en",
@@ -10467,7 +10467,7 @@ DELETE https://DomainName/api/v1/loans/{loanId}/charges/{chargeId}
 					</code>
 					<code class="method-request">
 DELETE loans/1/charges/2
-Content-Type: application/json 
+Content-Type: application/json
 No Request Body:
 					</code>
 					<code class="method-response">
@@ -10480,7 +10480,7 @@ No Request Body:
 					</code>
 				</div>
 			</div>
-			
+
 <!-- Loan Rescheduling content -->
 <a id="loan_rescheduling" name="loan_rescheduling" class="old-syle-anchor">&nbsp;</a>
 <div class="method-section">
@@ -10560,7 +10560,7 @@ No Request Body:
 					</table>
 				</div>
 			</div>
-			
+
 			<a id="loan_reschedule_request_create" name="loan_reschedule_request_create" class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
 				<div class="method-description">
@@ -10592,19 +10592,19 @@ POST https://DomainName/api/v1/rescheduleloans
 					<code class="method-request">
 POST rescheduleloans
 Content-Type: application/json Request Body:
-{ 
-	"loanId": 1, 
-	"graceOnPrincipal": 2, 
-	"graceOnInterest": 3, 
+{
+	"loanId": 1,
+	"graceOnPrincipal": 2,
+	"graceOnInterest": 3,
 	"extraTerms": 2,
-	"rescheduleFromDate": "04 December 2014", 
-	"dateFormat": "dd MMMM yyyy", 
-	"locale": "en", 
+	"rescheduleFromDate": "04 December 2014",
+	"dateFormat": "dd MMMM yyyy",
+	"locale": "en",
 	"recalculateInterest": true,
 	"submittedOnDate": "04 September 2014",
 	"newInterestRate" : 28,
 	"rescheduleReasonId": 1
-} 
+}
 					</code>
 					<code class="method-response">
 {
@@ -10617,17 +10617,17 @@ Content-Type: application/json Request Body:
 					<code class="method-request">
 POST rescheduleloans
 Content-Type: application/json Request Body:
-{ 
-	"loanId": 1, 
-	"graceOnPrincipal": 2, 
-	"rescheduleFromDate": "04 December 2014", 
+{
+	"loanId": 1,
+	"graceOnPrincipal": 2,
+	"rescheduleFromDate": "04 December 2014",
 	"adjustedDueDate": "20 December 2014",
-	"dateFormat": "dd MMMM yyyy", 
-	"locale": "en", 
+	"dateFormat": "dd MMMM yyyy",
+	"locale": "en",
 	"submittedOnDate": "04 September 2014",
 	"rescheduleReasonComment" : "Client has gone AWOL",
 	"rescheduleReasonId": 1
-} 
+}
 					</code>
 					<code class="method-response">
 {
@@ -10710,7 +10710,7 @@ GET https://DomainName/api/v1/rescheduleloans/{requestId}
 GET https://DomainName/api/v1/rescheduleloans/{requestId}?command=previewLoanReschedule
 					</code>
 					<code class="method-response">
-						
+
   "currency": {
     "code": "KES",
     "name": "Kenyan Shilling",
@@ -11028,8 +11028,8 @@ POST https://DomainName/api/v1/offices
 					</code>
 					<code class="method-request">
 POST offices
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
     "name": "Example New Branch",
     "dateFormat": "dd MMMM yyyy",
@@ -11059,10 +11059,10 @@ PUT https://DomainName/api/v1/offices/{officeId}
 					</code>
 					<code class="method-request">
 PUT offices/1
-Content-Type: application/json 
-Request Body: 
-{ 
-	"name": "Name is updated" 
+Content-Type: application/json
+Request Body:
+{
+	"name": "Name is updated"
 }
 					</code>
 					<code class="method-response">
@@ -11249,7 +11249,7 @@ Request Body:
 							</td>
 						</tr>
 
-						
+
 
 
 <tr class=alt>
@@ -11258,7 +11258,7 @@ Request Body:
 <tr>
 	<td class=fielddesc>
 An enumeration that indicates the type of transaction processing strategy to be used. This relates to functionality that is also known as <b>Payment Application Logic</b>.
-	
+
 <p>A number of out of the box approaches exist, some are custom to specific MFIs, some are more general and indicate the order in which payments are processed.</p>
 
 <p>Refer to the <a href="#paymentapplicationlogic">Payment Application Logic / Transaction Processing Strategy<a> section in the appendix for more detailed overview of each available <b>payment application logic</b> provided out of the box.</p>
@@ -12582,13 +12582,13 @@ GET https://DomainName/api/v1/loanproducts/{productId}
 			<div class="method-section">
 				<div class="method-description">
 					<h4>Create a Loan Product</h4>
-					<p>Depending of the Accounting Rule (accountingRule) selected, 
-				     additional fields with details of the appropriate Ledger Account 
+					<p>Depending of the Accounting Rule (accountingRule) selected,
+				     additional fields with details of the appropriate Ledger Account
 					 identifiers would need to be passed in.
 					</p>
 
 					</p>Refer <a href="https://mifosforge.jira.com/wiki/display/MIFOSX/A+Possible+accounting+Spec">
-					 MifosX Accounting Specs Draft</a> for more details regarding the 
+					 MifosX Accounting Specs Draft</a> for more details regarding the
 					 significance of the selected accounting rule
 					</p>
 
@@ -12598,7 +12598,7 @@ GET https://DomainName/api/v1/loanproducts/{productId}
 						</tr>
 						<tr class=alt>
 							<td>name, shortName, currencyCode, digitsAfterDecimal, inMultiplesOf, principal,
-								numberOfRepayments, repaymentEvery, repaymentFrequencyType, 
+								numberOfRepayments, repaymentEvery, repaymentFrequencyType,
 								interestRatePerPeriod, interestRateFrequencyType, amortizationType, interestType,
 								interestCalculationPeriodType, transactionProcessingStrategyId,
 								accountingRule, isInterestRecalculationEnabled, daysInYearType, daysInMonthType</td>
@@ -12623,8 +12623,8 @@ GET https://DomainName/api/v1/loanproducts/{productId}
 							<td><div class="mifosXHeading2">Additional Mandatory Fields for Cash(2) based accounting</div></td>
 						</tr>
 						<tr class=alt>
-							<td>fundSourceAccountId, loanPortfolioAccountId, interestOnLoanAccountId, 
-								incomeFromFeeAccountId, incomeFromPenaltyAccountId, 
+							<td>fundSourceAccountId, loanPortfolioAccountId, interestOnLoanAccountId,
+								incomeFromFeeAccountId, incomeFromPenaltyAccountId,
 								writeOffAccountId, transfersInSuspenseAccountId, overpaymentLiabilityAccountId</td>
 						</tr>
 					</table>
@@ -12633,13 +12633,13 @@ GET https://DomainName/api/v1/loanproducts/{productId}
 							<td><div class="mifosXHeading2">Additional Mandatory Fields for periodic (3) and upfront (4)accrual accounting</div></td>
 						</tr>
 						<tr class=alt>
-							<td>fundSourceAccountId, loanPortfolioAccountId, interestOnLoanAccountId, 
-								incomeFromFeeAccountId, incomeFromPenaltyAccountId, 
+							<td>fundSourceAccountId, loanPortfolioAccountId, interestOnLoanAccountId,
+								incomeFromFeeAccountId, incomeFromPenaltyAccountId,
 								writeOffAccountId, receivableInterestAccountId, receivableFeeAccountId,
 								receivablePenaltyAccountId, transfersInSuspenseAccountId, overpaymentLiabilityAccountId</td>
 						</tr>
 					</table>
-					<table class=matrixHeading>						
+					<table class=matrixHeading>
 						<tr class="matrixHeadingBG">
 							<td><div class="mifosXHeading2">Additional Mandatory Fields if interest recalculation is enabled(true)</div></td>
 						</tr>
@@ -12647,7 +12647,7 @@ GET https://DomainName/api/v1/loanproducts/{productId}
 							<td>interestRecalculationCompoundingMethod, rescheduleStrategyMethod, recalculationRestFrequencyType</td>
 						</tr>
 					</table>
-					<table class=matrixHeading>						
+					<table class=matrixHeading>
 						<tr class="matrixHeadingBG">
 							<td><div class="mifosXHeading2">Additional Optional Fields if interest recalculation is enabled(true) and recalculationRestFrequencyType is not same as repayment period</div></td>
 						</tr>
@@ -12655,7 +12655,7 @@ GET https://DomainName/api/v1/loanproducts/{productId}
 							<td>recalculationRestFrequencyInterval, recalculationRestFrequencyDate</td>
 						</tr>
 					</table>
-					<table class=matrixHeading>						
+					<table class=matrixHeading>
 						<tr class="matrixHeadingBG">
 							<td><div class="mifosXHeading2">Additional Mandatory Fields if Hold Guarantee funds is enabled(true)</div></td>
 						</tr>
@@ -12663,7 +12663,7 @@ GET https://DomainName/api/v1/loanproducts/{productId}
 							<td>mandatoryGuarantee</td>
 						</tr>
 					</table>
-					<table class=matrixHeading>						
+					<table class=matrixHeading>
 						<tr class="matrixHeadingBG">
 							<td><div class="mifosXHeading2">Additional Optional Fields if Hold Guarantee funds is enabled(true)</div></td>
 						</tr>
@@ -12678,7 +12678,7 @@ POST https://DomainName/api/v1/loanproducts
 					</code>
 					<code class="method-request">
 POST loanproducts
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {"currencyCode":"USD",
 "includeInBorrowerCycle":"true",
@@ -12738,13 +12738,13 @@ Request Body:
 }
 					</code>
 					<code class="method-response">
-{ 
-	"resourceId": 1 
+{
+	"resourceId": 1
 }
 					</code>
 					<code class="method-request">
 POST loanproducts
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
     "name": "LP Cash Accounting",
@@ -12800,17 +12800,17 @@ Request Body:
       "incomeAccountId": "9"
     }
   ]
-    
+
 }
 					</code>
 					<code class="method-response">
-{ 
-	"resourceId": 2 
+{
+	"resourceId": 2
 }
 					</code>
 					<code class="method-request">
 POST loanproducts
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
     "name": "LP Accrual Accounting",
@@ -12846,11 +12846,11 @@ Request Body:
 }
 					</code>
 					<code class="method-response">
-{ 
-	"resourceId": 3 
+{
+	"resourceId": 3
 }
 					</code>
-			
+
 				</div>
 			</div>
 
@@ -12866,8 +12866,8 @@ PUT https://DomainName/api/v1/loanproducts/{loanId}
 					</code>
 					<code class="method-request">
 PUT loanproducts/1
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
     "locale": "en_GB",
     "principal": "70,000.00"
@@ -12884,8 +12884,8 @@ Request Body:
 					</code>
 					<code class="method-request">
 PUT loanproducts/3
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
     "locale": "en",
     "isInterestRecalculationEnabled":"true",
@@ -13188,19 +13188,19 @@ POST https://DomainName/api/v1/loanproducts/5/productmix
 					</code>
 					<code class="method-request">
 POST loanproducts/{productId}/productmix
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {"restrictedProducts":["1"]}
 					</code>
 					<code class="method-response">
-{ 
+{
   "changes":{
     "restrictedProductsForMix":[1],
     "removedProductsForMix":[]
   },
   "productId":5
 }
-					</code>			
+					</code>
 				</div>
 			</div>
 
@@ -13216,8 +13216,8 @@ PUT https://DomainName/api/v1/loanproducts/{productId}/productmix
 					</code>
 					<code class="method-request">
 PUT loanproducts/5/productmix
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
     "restrictedProducts":["3"]
 }
@@ -13256,7 +13256,7 @@ DELETE loanproducts/5/productmix
 }
           </code>
         </div>
-      </div>      
+      </div>
 			<!-- end of loan products mix api docs -->
 
 		<!-- start of holidays api docs -->
@@ -13377,8 +13377,8 @@ POST https://DomainName/api/v1/holidays
 				</code>
 				<code class="method-request">
 POST holidays
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
 "name": "Good Friday",
 "description": "Good Friday",
@@ -13414,8 +13414,8 @@ POST https://DomainName/api/v1/holidays/{holidayId}?command=activate
 				</code>
 				<code class="method-request">
 POST holidays
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
 }
 				</code>
@@ -13481,8 +13481,8 @@ PUT https://DomainName/api/v1/holidays/{holidayId}
 				</code>
 				<code class="method-request">
 PUT holidays/1
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
 	name:"Independence day",
 	description: "Holiday for Independence day celebration"
@@ -13512,8 +13512,8 @@ DELETE https://DomainName/api/v1/holidays/{holidayId}
 				</code>
 				<code class="method-request">
 DELETE holidays/1
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
 }
 				</code>
@@ -13534,10 +13534,10 @@ Request Body:
 					<p>The days of the week that are workdays.
 					</p>
 					<p>
-						Rescheduling of repayments when it falls on a non-working is turned on /off by enable/disable reschedule-future-repayments parameter in <a href="#configs_global">Global configurations</a>.							
+						Rescheduling of repayments when it falls on a non-working is turned on /off by enable/disable reschedule-future-repayments parameter in <a href="#configs_global">Global configurations</a>.
 					</p>
 					<p>
-						Allow transactions on non-working days is configurable by enabling/disbaling the allow-transactions-on-non_workingday parameter in <a href="#configs_global">Global configurations</a>.							
+						Allow transactions on non-working days is configurable by enabling/disbaling the allow-transactions-on-non_workingday parameter in <a href="#configs_global">Global configurations</a>.
 					</p>
 				<table id="nw_repayment_schedule_rule" class=matrixHeading>
 					<tr class="matrixHeadingBG">
@@ -13575,7 +13575,7 @@ Request Body:
 			</div>
 		</div>
 
-			<!-- end of workingdays api docs -->			
+			<!-- end of workingdays api docs -->
 
 			<!-- start of configurations api docs -->
 			<a id="configs" name="configs" class="old-syle-anchor">&nbsp;</a>
@@ -13657,8 +13657,8 @@ PUT https://DomainName/api/v1/currencies
 					</code>
 					<code class="method-request">
 PUT currencies
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
     "currencies": [
         "KES",
@@ -13808,7 +13808,7 @@ PUT https://DomainName/api/v1/configurations/9
 					</code>
 					<code class="method-request">
 PUT configurations
-Content-Type: application/json 
+Content-Type: application/json
 Request Body: {
                 "enabled":"true",
                 "value":2
@@ -13882,7 +13882,7 @@ GET https://DomainName/api/v1/caches
 		</div>
 	</div>
 
-	<a id="caches_switch" name="caches_switch" 
+	<a id="caches_switch" name="caches_switch"
 						class="old-syle-anchor">&nbsp;</a>
 	<div class="method-section">
 		<div class="method-description">
@@ -13895,8 +13895,8 @@ PUT https://DomainName/api/v1/caches
 			</code>
 			<code class="method-request">
 PUT caches
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
 	"cacheType": 2
 }
@@ -13929,13 +13929,14 @@ Request Body:
 			<div class="method-section">
 				<div class="method-description">
 					<h4>Create a Hook</h4>
-					<p>The following parameters can be passed for the creation of a hook :- 
+					<p>The following parameters can be passed for the creation of a hook :-
 						<ul>
 							<li> name - string - Required. The name of the template that is being called. (See /hooks/template for the list of valid hook names.)</li>
 							<li> isActive - boolean - Determines whether the hook is actually triggered.</li>
 							<li> events - array - Determines what events the hook is triggered for.
 </li>
 							<li> config - hash - Required. Key/value pairs to provide settings for this hook. These settings vary between the templates.</li>
+							<li> templateId - Optional. The UGD template ID associated with the same entity (client or loan).</li>
 						<ul></p>
 				</div>
 				<div class="method-example">
@@ -13943,13 +13944,14 @@ Request Body:
 POST https://DomainName/api/v1/hooks
 					</code>
 					<code class="method-request">
-POST hooks 
-Content-Type: application/json 
-Request Body: 
+POST hooks
+Content-Type: application/json
+Request Body:
 {
   "name": "Web",
   "isActive": true,
   "displayName": "Kremlin",
+  "templateId": 1,
   "events": [
       {
         "actionName": "DISBURSE",
@@ -13967,8 +13969,8 @@ Request Body:
 }
 					</code>
 					<code class="method-response">
-{ 
-	"resourceId": 4 
+{
+	"resourceId": 4
 }
 					</code>
 				</div>
@@ -13996,6 +13998,8 @@ GET https://DomainName/api/v1/hooks
     "isActive": true,
     "createdAt": [2014, 9, 16],
     "updatedAt": [2014, 9, 16],
+    "templateId": 1,
+    "templateName": "My UGD",
     "events": [
       {
         "actionName": "DISBURSE",
@@ -14043,6 +14047,8 @@ GET https://DomainName/api/v1/hooks/{hookId}
     "isActive": true,
     "createdAt": [2014, 9, 16],
     "updatedAt": [2014, 9, 16],
+    "templateId": 1,
+    "templateName": "My UGD",
     "events": [
       {
         "actionName": "DISBURSE",
@@ -14081,8 +14087,8 @@ PUT https://DomainName/api/v1/hooks/{hookId}
 					</code>
 					<code class="method-request">
 PUT hooks/4
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
   "name": "Web",
   "isActive": true,
@@ -14132,12 +14138,12 @@ Request Body:
 DELETE https://DomainName/api/v1/hooks/{hookId}
 					</code>
 					<code class="method-request">
-DELETE hooks/4 
+DELETE hooks/4
 Content-Type: application/json
 					</code>
 					<code class="method-response">
-{ 
-	"resourceId": 4 
+{
+	"resourceId": 4
 }
 					</code>
 				</div>
@@ -14233,16 +14239,16 @@ GET https://DomainName/api/v1/hooks/template
 POST https://DomainName/api/v1/codes
 					</code>
 					<code class="method-request">
-POST codes 
-Content-Type: application/json 
-Request Body: 
+POST codes
+Content-Type: application/json
+Request Body:
 {
 	"name": "MyNewCode"
 }
 					</code>
 					<code class="method-response">
-{ 
-	"resourceId": 4 
+{
+	"resourceId": 4
 }
 					</code>
 				</div>
@@ -14319,9 +14325,9 @@ PUT https://DomainName/api/v1/codes/{codeId}
 					</code>
 					<code class="method-request">
 PUT codes/4
-Content-Type: application/json 
-Request Body: 
-{ 
+Content-Type: application/json
+Request Body:
+{
 	"name": "MyNewCode(changed)"
 }
 					</code>
@@ -14348,12 +14354,12 @@ Request Body:
 DELETE https://DomainName/api/v1/codes/{codeId}
 					</code>
 					<code class="method-request">
-DELETE codes/4 
+DELETE codes/4
 Content-Type: application/json
 					</code>
 					<code class="method-response">
-{ 
-	"resourceId": 4 
+{
+	"resourceId": 4
 }
 					</code>
 				</div>
@@ -14386,9 +14392,9 @@ Content-Type: application/json
 POST https://DomainName/api/v1/codes/1/codevalues
 					</code>
 					<code class="method-request">
-POST codes/1/codevalues 
-Content-Type: application/json 
-Request Body: 
+POST codes/1/codevalues
+Content-Type: application/json
+Request Body:
 {
 	"name":"Ration Card",
 	"description: "Ration card information",
@@ -14396,8 +14402,8 @@ Request Body:
 }
 					</code>
 					<code class="method-response">
-{ 
-	"resourceId": 4 
+{
+	"resourceId": 4
 }
 					</code>
 				</div>
@@ -14490,9 +14496,9 @@ PUT https://DomainName/api/v1/codes/{codeId}/codevalues/{codevalueId}
 					</code>
 					<code class="method-request">
 PUT codes/1/codevalues/1
-Content-Type: application/json 
-Request Body: 
-{ 
+Content-Type: application/json
+Request Body:
+{
 	"name": "Indian Passport",
 	"description": "Indian Passport information",
 	"position":2
@@ -14501,7 +14507,7 @@ Request Body:
 					<code class="method-response">
 {
   "resourceId": 1,
-  "changes": 
+  "changes":
   {
     "name": "Indian Passport",
     "description": "Indian Passport information",
@@ -14524,11 +14530,11 @@ Request Body:
 DELETE https://DomainName/api/v1/codes/{codeId}/codevalues/{codevalueId}
 					</code>
 					<code class="method-request">
-DELETE codes/1/codevalues/5 
+DELETE codes/1/codevalues/5
 Content-Type: application/json
 					</code>
 					<code class="method-response">
-{ 
+{
 	"resourceId": 5
 }
 					</code>
@@ -14543,14 +14549,14 @@ Content-Type: application/json
 					<h3>Audits</h3>
 					<p>Every non-read Mifos API request is audited.  A fully processed request can
                                         not be changed or deleted.  See maker checker api for situations where an audit is not
-                                        fully processed.<br><br>                                 
-                                        
+                                        fully processed.<br><br>
+
                                         Permissions: To search and look at audit entries a user needs to be attached to a role
                                         that has one of the ALL_FUNCTIONS, ALL_FUNCTIONS_READ or READ_AUDIT permissions.<br><br>
-                                        
+
                                         Data Scope: A user can only see audits that are within their data scope.  However,
                                         'head office' users can see all audits including those that aren't office/branch related
-                                        e.g. Loan Product changes.                                        
+                                        e.g. Loan Product changes.
 					<p/>
 				</div>
 			</div>
@@ -14567,50 +14573,50 @@ Content-Type: application/json
                                             <dt>actionName</dt>
                                             <dd>optional</dd>
                                             <dd>Examples: CREATE, UPDATE, DISBURSE</dd>
-                                            
+
                                             <dt>entityName</dt>
                                             <dd>optional</dd>
                                             <dd>Examples: CLIENT, LOAN, FUND</dd>
-                                                
+
 					    <dt>resourceId</dt>
                                             <dd>optional, <span>
                                             The id value of the entityName</span>
                                             </dd>
-                                            
+
 					    <dt>makerId</dt>
                                             <dd>optional, <span>
                                             The id value of the application user creating the entry</span>
                                             </dd>
-                                            
+
                                             <dt>makerDateTimeFrom</dt>
                                             <dd>optional, <span>
                                             Get entries created on or after this</span>
                                             </dd>
                                             <dd>Example: 2013-04-10 08:00:00</dd>
-                                            
+
                                             <dt>makerDateTimeTo</dt>
                                             <dd>optional, <span>
                                             Get entries created on or before this</span>
                                             </dd>
                                             <dd>Example: 2013-05-10 08:00:00</dd>
-                                            
+
 					    <dt>checkerId</dt>
                                             <dd>optional, <span>
                                             The id value of the application user that checked (approved) the entry</span>
                                             </dd>
-                                            
+
                                             <dt>checkerDateTimeFrom</dt>
                                             <dd>optional, <span>
                                             Get entries checked on or after this</span>
                                             </dd>
                                             <dd>Example: 2013-04-10 08:00:00</dd>
-                                            
+
                                             <dt>checkerDateTimeTo</dt>
                                             <dd>optional, <span>
                                             Get entries checked on or before this</span>
                                             </dd>
                                             <dd>Example: 2013-05-10 18:00:00</dd>
-                                            
+
 					    <dt>processingResult</dt>
                                             <dd>optional, <span>
                                             The enum value of the processing status</span>
@@ -14621,33 +14627,33 @@ Content-Type: application/json
                                             2: awaiting.approval<br>
                                             3: rejected
                                             </dd>
-                                            
+
 					    <dt>officeId</dt>
                                             <dd>optional, <span>
                                             The id value of the office/branch associated with the entry (if there is one)</span>
                                             </dd>
-                                            
+
 					    <dt>groupId</dt>
                                             <dd>optional, <span>
                                             The id value of the group associated with the entry (if there is one).
                                             A group is a general idea and may be a Center, a Group, a Communal Bank or other.</span>
                                             </dd>
-                                            
+
 					    <dt>clientId</dt>
                                             <dd>optional, <span>
                                             The id value of the client associated with the entry (if there is one)</span>
                                             </dd>
-                                            
+
 					    <dt>loanId</dt>
                                             <dd>optional, <span>
                                             The id value of the loan associated with the entry (if there is one)</span>
                                             </dd>
-                                            
+
 					    <dt>savingsAccountId</dt>
                                             <dd>optional, <span>
                                             The id value of the savings account associated with the entry (if there is one)</span>
                                             </dd>
-                                            
+
 					    <dt>includeJson</dt>
                                             <dd>optional, <span>
                                             Values are true, false.  Default is false.</span>
@@ -14663,7 +14669,7 @@ Content-Type: application/json
 									Integer <span>optional</span>, defaults to 0
 								</dd>
 								<dd>Indicates from what result to start from.</dd>
-						
+
 						<dt>limit</dt>
 								<dd>
 									Integer <span>optional</span>, defaults to 200
@@ -14681,7 +14687,7 @@ Content-Type: application/json
 									String <span>optional</span>, one of <span>ASC, DESC</span>
 								</dd>
 								<dd>Indicates what way to order results if <i>orderBy</i> is used.</dd>
-                                            
+
 					</dl>
 					<p>Example Requests:</p>
 					<div class=apiClick>audits</div><br>
@@ -14778,7 +14784,7 @@ GET https://DomainName/api/v1/audits
 GET https://DomainName/api/v1/audits?paged=true&limit=5
 					</code>
 					<code class="method-response">
-{						
+{
   "totalFilteredRecords": 30,
   "pageItems": [
   {
@@ -14979,7 +14985,7 @@ GET https://DomainName/api/v1/audits
 			<div class="method-section">
 				<div class="method-description">
 					<h3>Account number format</h3>
-					<p>Account number preferences are used to describe custom formats for account numbers associated with Customer, Loan and Savings accounts.                   
+					<p>Account number preferences are used to describe custom formats for account numbers associated with Customer, Loan and Savings accounts.
 					</p>
 					<table class=matrixHeading>
 						<tr class="matrixHeadingBG">
@@ -15006,7 +15012,7 @@ GET https://DomainName/api/v1/audits
 							details
 							</td>
 						</tr>
-						
+
 					</table>
 				</div>
 			</div>
@@ -15218,7 +15224,7 @@ POST https://DomainName/api/v1/accountnumberformats
                     </code>
                     <code class="method-request">
 POST /accountnumberformats
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
     accountType :1,
@@ -15233,7 +15239,7 @@ Request Body:
                     </code>
                     <code class="method-request">
 POST /accountnumberformats
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
     accountType :2,
@@ -15260,8 +15266,8 @@ PUT https://DomainName/api/v1/accountnumberformats/{accountnumberformatId}
 					</code>
 					<code class="method-request">
 PUT accountnumberformats/2
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
   prefixType:1
 }
@@ -15293,7 +15299,7 @@ DELETE https://DomainName/api/v1/accountnumberformats/{accountnumberformatId}
 					</code>
 					<code class="method-request">
 DELETE accountnumberformats/2
-Content-Type: application/json 
+Content-Type: application/json
 No Request Body:
 					</code>
 					<code class="method-response">
@@ -15315,18 +15321,18 @@ No Request Body:
                                         Then, another user that has "Checker" rights for that transaction, can inspect
                                         and approve the data.
                                         </p>
-                                        
+
                                         <p>By default, Maker Checker functionality is disabled.
                                         See <a href="#configs_globalconfig_update">Update Global Configuration</a> to enable/disable
                                         Maker Checker functionality at a global level.
                                         </p>
-                                        
+
                                         <p>
                                         Additionally, Maker Checker functionality for each transaction (permission) is disabled by default.
                                         see <a href="#permissions_update">Enable/Disable Permissions for Maker Checker</a> to enable/disable
                                         Maker Checker functionality at a transaction (permission) level.
                                         </p>
-                                        
+
                                         <p>
                                         Finally, to give checking rights to a user (via a role associated with the user) see
                                         <a href="#rolespermissions_update">Update a Role's Permissions</a>
@@ -15349,13 +15355,13 @@ No Request Body:
                                         When a user "makes" an entry that is enabled for Maker Checker, it is audited and the audit status
                                         is set to a value of 2 (awaiting.approval).
                                         </p>
-                                                                                                                        
+
                                         Checkers can only Check and approve entries that they have been permitted to check.<br><br>
-                                        
+
                                         Checkers can only Check and approve entries that are within their data scope.  However,
-                                        'head office' Checkers can Check and approve all entries 
+                                        'head office' Checkers can Check and approve all entries
                                         including those that aren't office/branch related (as long as they have the Checker permissions)
-                                        e.g. Loan Product changes.                                        
+                                        e.g. Loan Product changes.
 					<p/>
 				</div>
 			</div>
@@ -15371,64 +15377,64 @@ No Request Body:
                                             <dt>actionName</dt>
                                             <dd>optional</dd>
                                             <dd>Examples: CREATE, UPDATE, DISBURSE</dd>
-                                            
+
                                             <dt>entityName</dt>
                                             <dd>optional</dd>
                                             <dd>Examples: CLIENT, LOAN, FUND</dd>
-                                                
+
 					    <dt>resourceId</dt>
                                             <dd>optional, <span>
                                             The id value of the entityName</span>
                                             </dd>
-                                            
+
 					    <dt>makerId</dt>
                                             <dd>optional, <span>
                                             The id value of the application user creating the entry</span>
                                             </dd>
-                                            
+
                                             <dt>makerDateTimeFrom</dt>
                                             <dd>optional, <span>
                                             Get entries created on or after this</span>
                                             </dd>
                                             <dd>Example: 2013-04-10 08:00:00</dd>
-                                            
+
                                             <dt>makerDateTimeTo</dt>
                                             <dd>optional, <span>
                                             Get entries created on or before this</span>
                                             </dd>
                                             <dd>Example: 2013-05-10 08:00:00</dd>
-                                                                                                                                    
+
 					    <dt>officeId</dt>
                                             <dd>optional, <span>
                                             The id value of the office/branch associated with the entry (if there is one)</span>
                                             </dd>
-                                            
+
 					    <dt>groupId</dt>
                                             <dd>optional, <span>
                                             The id value of the group associated with the entry (if there is one).
                                             A group is a general idea and may be a Center, a Group, a Communal Bank or other.</span>
                                             </dd>
-                                            
+
 					    <dt>clientId</dt>
                                             <dd>optional, <span>
                                             The id value of the client associated with the entry (if there is one)</span>
                                             </dd>
-                                            
+
 					    <dt>loanId</dt>
                                             <dd>optional, <span>
                                             The id value of the loan associated with the entry (if there is one)</span>
                                             </dd>
-                                            
+
 					    <dt>savingsAccountId</dt>
                                             <dd>optional, <span>
                                             The id value of the savings account associated with the entry (if there is one)</span>
                                             </dd>
-                                            
+
 					    <dt>includeJson</dt>
                                             <dd>optional, <span>
                                             Values are true, false.  Default is false.</span>
                                             </dd>
-                                            
+
 					</dl>
 					<p>Example Requests:</p>
 					<div class=apiClick>makercheckers</div><br>
@@ -15566,7 +15572,7 @@ Content-Type: application/json
 					<code class="method-response">{ "auditId": 1 } </code>
 				</div>
 			</div>
-                        
+
 			<a id="makercheckers_delete" name="makercheckers_delete" class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
 				<div class="method-description">
@@ -15583,7 +15589,7 @@ Content-Type: application/json
 					<code class="method-response">{ "auditId": 1 } </code>
 				</div>
 			</div>
-			
+
 			<!-- Maker Checker starts here -->
 			<a id="scheduler_jobs" name="scheduler_jobs" class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
@@ -15591,14 +15597,14 @@ Content-Type: application/json
 					<h3>MIFOSX-BATCH JOBS</h3>
 						<p>Batch jobs (also known as cron jobs on Unix-based systems) are a series of back-end jobs executed on a computer at a particular time defined in job's cron expression.
 						</p>
-						
+
 						<p>At any point, you can view the list of batch jobs scheduled to run along with other details specific to each job. Manually you can execute the jobs at any point of time.
 						</p>
 						<p>The scheduler status can be either "Active" or "Standby". If the scheduler status is Active, it indicates that all batch jobs are running/ will run as per the specified schedule.If the scheduler status is Standby, it will ensure all scheduled batch runs are suspended.
 						</p>
 				</div>
 			</div>
-			
+
 			<a id="scheduler_jobs_list" name="scheduler_jobs_list"
 				class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
@@ -15693,7 +15699,7 @@ GET https://DomainName/api/v1/jobs
 					</code>
 				</div>
 			</div>
-			
+
 			<a id="retrieve_scheduler_job" name="retrieve_scheduler_job"
 				class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
@@ -15727,7 +15733,7 @@ https://localhost:8443/mifosng-provider/api/v1/jobs/5
 					</code>
 				</div>
 			</div>
-			
+
 			<a id="update_scheduler_job" name="update_scheduler_job"
 				class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
@@ -15741,7 +15747,7 @@ PUT https://DomainName/api/v1/jobs/{jobId}
 					</code>
 					<code class="method-request">
 PUT jobs/1
-Content-Type: application/json 
+Content-Type: application/json
 {
   "displayName":"Update loan Summary",
   "cronExpression":"0 0 22 1/1 * ? *",
@@ -15749,7 +15755,7 @@ Content-Type: application/json
 }					</code>
 				</div>
 			</div>
-			
+
 			<a id="run_job" name="run_job"
 				class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
@@ -15766,7 +15772,7 @@ POST jobs/1?command=executeJob
 						</code>
 					</div>
 				</div>
-			
+
 			<a id="retrieve_job_runhistory" name="retrieve_job_runhistory"
 				class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
@@ -15844,7 +15850,7 @@ GET https://DomainName/api/v1/jobs/{jobid}/runhistory?offset=0&limit=200
 					</code>
 				</div>
 			</div>
-			
+
 			<a id="retrieve_scheduler_status" name="retrieve_scheduler_status"
 				class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
@@ -15866,7 +15872,7 @@ https://localhost:8443/mifosng-provider/api/v1/scheduler
 					</code>
 				</div>
 			</div>
-			
+
 			<a id="activate_scheduler" name="activate_scheduler"
 				class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
@@ -15883,7 +15889,7 @@ POST scheduler?command=start
 					</code>
 				</div>
 			</div>
-			
+
 			<a id="suspend_scheduler" name="suspend_scheduler" class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
 				<div class="method-description">
@@ -15907,7 +15913,7 @@ POST scheduler?command=stop
 					<h3>Funds</h3>
                                 </div>
                         </div>
-                                        
+
 			<a id="funds_create" name="funds_create" class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
 				<div class="method-description">
@@ -15920,16 +15926,16 @@ POST https://DomainName/api/v1/funds
 					</code>
 					<code class="method-request">
 POST funds
-Content-Type: application/json 
-Request Body: 
-{ 
+Content-Type: application/json
+Request Body:
+{
 	"name": "EU Agri Fund"
 }
 					</code>
 					<code class="method-response">
-{ 
-	"resourceId": 1 
-} 
+{
+	"resourceId": 1
+}
 					</code>
 				</div>
 			</div>
@@ -15970,9 +15976,9 @@ GET https://DomainName/api/v1/funds
 GET https://DomainName/api/v1/funds/{fundId}
 					</code>
 					<code class="method-response">
-{ 
-	"id": 1, 
-	"name": "EU Agri Fund" 
+{
+	"id": 1,
+	"name": "EU Agri Fund"
 }
 					</code>
 				</div>
@@ -15990,10 +15996,10 @@ PUT https://DomainName/api/v1/funds/{fundId}
 					</code>
 					<code class="method-request">
 PUT funds/1
-Content-Type: application/json 
-Request Body: 
-{ 
-	"name": "EU Agri Fund (2010-2020)" 
+Content-Type: application/json
+Request Body:
+{
+	"name": "EU Agri Fund (2010-2020)"
 }
 					</code>
 					<code class="method-response">
@@ -16042,14 +16048,14 @@ Request Body:
 							<td>mobileNo</td>
 						</tr>
 						<tr>
-							<td class=fielddesc>Mobile number of an Employee.							
+							<td class=fielddesc>Mobile number of an Employee.
 							</td>
 						</tr>
 						<tr class=alt>
 							<td>isLoanOfficer</td>
 						</tr>
 						<tr>
-							<td class=fielddesc>Indicates whether the employee account is to be created as <b>Loan Officer</b>. If isLoanOfficer=true, then the employee is <b>Loan Officer</b>. If isLoanOfficer=false, then the employee is 
+							<td class=fielddesc>Indicates whether the employee account is to be created as <b>Loan Officer</b>. If isLoanOfficer=true, then the employee is <b>Loan Officer</b>. If isLoanOfficer=false, then the employee is
 								<b>not Loan Officer.</b>
 							</td>
 						</tr>
@@ -16092,9 +16098,9 @@ Request Body:
 POST https://DomainName/api/v1/staff
 					</code>
 					<code class="method-request">
-POST staff 
-Content-Type: application/json 
-Request Body: 
+POST staff
+Content-Type: application/json
+Request Body:
 {
     "officeId": 1,
     "firstname": "John",
@@ -16217,9 +16223,9 @@ PUT https://DomainName/api/v1/staff/{staffId}
 					</code>
 					<code class="method-request">
 PUT staff/1
-Content-Type: application/json 
-Request Body: 
-{ 
+Content-Type: application/json
+Request Body:
+{
 	"isLoanOfficer": "false",
 	"externalId": "17Hbb"
 }
@@ -16306,24 +16312,24 @@ Request Body:
 			</tr>
 			<tr class=alt>
 				<td>minCap</td>
-            </tr>	
-            <tr> 
+            </tr>
+            <tr>
 				<td class=fielddesc><b>Optional</b>: Can be used when a '% of Amount' value is used for <i>chargeCalculationType</i>.
 				<p>Used to enforce a minimum charge amount in cases where the calculated amount is less than the minimum amount provided.</p>
 				<p>e.g. A 2% fee with a minimum cap of 500:</br>
 				In case of a 5000 loan, the 2% is 100, and therefore automatically 500 is used as the value of the charge.
-				</p>  
+				</p>
 				</td>
-            </tr>	
+            </tr>
             <tr class=alt>
 				<td>maxCap</td>
-            </tr>	
+            </tr>
             <tr>
             	<td class=fielddesc><b>Optional</b>: Can be used when a '% of Amount' value is used for <i>chargeCalculationType</i>.
 				<p>Used to enforce a maximum charge amount in cases where the calculated amount is greater than the maximum amount provided.</p>
 				<p>e.g. A 2% fee, with a maximum of 2000.:</br>
 				In case of a 150000 loan, the 2% adds up to 3000 charge, and therefore the maximum cap of 2000 will be used.
-				</p>  
+				</p>
 				</td>
             </tr>
 			<tr class=alt>
@@ -16350,13 +16356,13 @@ Request Body:
 					1=Account Transfer
 				</td>
 			</tr>
-			
+
 			<tr class=alt>
 				<td>feeOnMonthDay</td>
 			</tr>
 			<tr>
             	<td class=fielddesc>Used along with <i>monthDayFormat</i> to indicate the recurring charge due date starting on a given day of the month and follow specified <i>feeInterval</i>. e.g. fee due date starting on <b>10 May</b> with <i>feeInterval</i> of two (2) months then a recurring fee on 10th of every two months is applied to savings account. <i>monthDayFormat</i> indicates day and month formatting used e.g. "dd MMM" for 10 May <br/>
-            	This field is mandatory if <i>chargeTimeType</i> is of type <b>Monthly Fee</b> 
+            	This field is mandatory if <i>chargeTimeType</i> is of type <b>Monthly Fee</b>
             	</td>
             </tr>
             <tr class=alt>
@@ -16372,7 +16378,7 @@ Request Body:
 			</tr>
             <tr>
             	<td class=fielddesc>This field is Optional Used to indicate the recurring(days,weeks,months and Years) charge due date starting on system calculated date for overdue penalty.<br/></td>
-            </tr>						
+            </tr>
 		</table>
 	</div>
 </div>
@@ -16631,7 +16637,7 @@ POST https://DomainName/api/v1/charges
 			</code>
 			<code class="method-request">
 POST charges
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 "name": "Loan service fee",
@@ -16652,7 +16658,7 @@ Request Body:
 			</code>
 			<code class="method-request">
 POST charges
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 "locale": "en",
@@ -16677,7 +16683,7 @@ Request Body:
 
 			<code class="method-request">
 POST charges
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 "locale": "en",
@@ -16699,7 +16705,7 @@ Request Body:
 			</code>
 			<code class="method-request">
 POST charges
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 "locale": "en",
@@ -16723,7 +16729,7 @@ Request Body:
 			</code>
 			<code class="method-request">
 POST charges
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 	"chargeAppliesTo":1,
@@ -16930,11 +16936,11 @@ GET https://DomainName/api/v1/charges/{chargeId}
 PUT https://DomainName/api/v1/charges/{chargeId}
 					</code>
 					<code class="method-request">
-PUT charges/1 
-Content-Type: application/json 
-Request Body: 
-{ 
-	"name": "Loan service fee(changed)" 
+PUT charges/1
+Content-Type: application/json
+Request Body:
+{
+	"name": "Loan service fee(changed)"
 }
 					</code>
 					<code class="method-response">
@@ -16977,16 +16983,16 @@ Content-Type: application/json
 						working day. The branch office users might not understand enough of accounting to figure out which
 						account needs to get credited and which account needs to be debited to represent this transaction.
 					</p>
-					<p>Enter accounting rules, an abstraction on top of manual Journal entires for enabling 
+					<p>Enter accounting rules, an abstraction on top of manual Journal entires for enabling
 					 simpler data entry.
-					 An accounting rule can define any of the following abstractions  
+					 An accounting rule can define any of the following abstractions
 					<ul>
 					 	<li>A Simple journal entry where both the credit and debit account have been preselected</li>
 					 	<li>A Simple journal entry where either credit or debit accounts have been limited to a
 					 		pre-selected list of accounts (Ex: Debit account should be one of "Bank of America" of "JP Morgan"
 					 		and credit account should be "Cash")
 					 	</li>
-					 	<li>A Compound journal entry where multiple debits and / or multiple credits may be made 
+					 	<li>A Compound journal entry where multiple debits and / or multiple credits may be made
 					 		amongst a set of preselected list of accounts (Ex: Credit account should be either "Bank Of America"
 					 		or "Cash" and debit account can be "Employee Salary" and/or "Miscellenous Expenses")
 					 	</li>
@@ -17034,14 +17040,14 @@ Content-Type: application/json
 							<td>debitTags</td>
 						</tr>
 						<tr>
-							<td class=fielddesc>A list of accounting Tags. Any Ledger account with this tag can serve as the 
+							<td class=fielddesc>A list of accounting Tags. Any Ledger account with this tag can serve as the
 								account to be debited.<br> This parameter is optional, if <b>accountToDebit</b> present in the request params</td>
 						</tr>
 						<tr class=alt>
 							<td>creditTags</td>
 						</tr>
 						<tr>
-							<td class=fielddesc>A list of accounting Tags. Any Ledger account with this tag can serve as the 
+							<td class=fielddesc>A list of accounting Tags. Any Ledger account with this tag can serve as the
 								account to be credited.<br> This parameter is optional, if <b>accountToCredit</b> present in the request params</td></td>
 						</tr>
 						<tr class=alt>
@@ -17177,7 +17183,7 @@ POST https://DomainName/api/v1/accountingrules
 					</code>
 					<code class="method-request">
 POST accountingrules
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 	"name": "test",
@@ -17195,7 +17201,7 @@ Request Body:
 					</code>
 					<code class="method-request">
 POST accountingrules
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 	"name": "fordocs",
@@ -17215,7 +17221,7 @@ Request Body:
 					</code>
 					<code class="method-request">
 POST accountingrules
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 	"name": "test123",
@@ -17234,7 +17240,7 @@ Request Body:
 					</code>
 					<code class="method-request">
 POST accountingrules
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 	"name": "fordocstest",
@@ -17366,11 +17372,11 @@ GET https://DomainName/api/v1/accountingrules/{accountingruleId}
 PUT https://DomainName/api/v1/accountingrules/{accountingruleId}
 					</code>
 					<code class="method-request">
-PUT accountingrules/1 
-Content-Type: application/json 
-Request Body: 
-{ 
-	"name": "Employee Salary posting rule" 
+PUT accountingrules/1
+Content-Type: application/json
+Request Body:
+{
+	"name": "Employee Salary posting rule"
 }
 					</code>
 					<code class="method-response">
@@ -17411,7 +17417,7 @@ Content-Type: application/json
 	        <p>When creating savings accounts, the details from the savings product are used to auto fill details of the savings account application process.</p>
 	        <table class=matrixHeading>
 	            <tr class="matrixHeadingBG"><td><div class="mifosXHeading2">Field Descriptions</div></td></tr>
-				
+
 				<tr class=alt><td>name</td></tr>
 	            <tr><td class=fielddesc>The name of the product offering.</td></tr>
 
@@ -17445,7 +17451,7 @@ Content-Type: application/json
 	            <tr><td class=fielddesc>The interest calculation method used: 1=Daily Balance or 2=Average Daily Balance</td></tr>
 
 				<tr class=alt><td>interestCalculationDaysInYearType</td></tr>
-	            <tr><td class=fielddesc>The setting for number of days in year to use: 360=360 Days, 365=365 Days</td></tr>	
+	            <tr><td class=fielddesc>The setting for number of days in year to use: 360=360 Days, 365=365 Days</td></tr>
 
 				<tr class=alt><td>minRequiredOpeningBalance</td></tr>
 	            <tr><td class=fielddesc><b>Optional</b>: If provided, sets the minimum deposit amount required to open a savings account e.g. <b>2,000</b></td></tr>
@@ -17477,7 +17483,7 @@ Content-Type: application/json
 	            <tr><td class=fielddesc><b>Optional</b>: If provided, balance must be greater than provided value for calculation of interest  e.g. <b>5,000</b> </td></tr>
 
 	            <tr class=alt><td>enforceMinRequiredBalance</td></tr>
-	            <tr><td class=fielddesc><b>Optional</b>: If set to <span>true</span>, validates that the account balance does not 
+	            <tr><td class=fielddesc><b>Optional</b>: If set to <span>true</span>, validates that the account balance does not
 	            fall below <span>minRequiredBalance</span> </td></tr>
 
 				<tr class=alt><td>minRequiredBalance</td></tr>
@@ -17493,8 +17499,8 @@ Content-Type: application/json
             <h4>Retrieve Savings Product Template</h4>
             <p>This is a convenience resource.  It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:
                 <ul>
-                <li class=normalli>Field Defaults</li>   
-                <li class=normalli>Allowed Value Lists</li>    
+                <li class=normalli>Field Defaults</li>
+                <li class=normalli>Allowed Value Lists</li>
                 </ul>
             </p>
             <p>Example Request: </p>
@@ -18071,7 +18077,7 @@ Request Body:
   "inMultiplesOf": 0,
   "locale": "en",
   "nominalAnnualInterestRate": "5.0",
-  "interestCompoundingPeriodType": 1, 
+  "interestCompoundingPeriodType": 1,
   "interestPostingPeriodType":4,
   "interestCalculationType": 1,
   "interestCalculationDaysInYearType": "365",
@@ -18275,11 +18281,11 @@ Request Body:
     }
   ],
   "charges": []
-}	
+}
 			</code>
         </div>
     </div>
-    
+
     <a id="savingsproducts_update" name="savingsproducts_update" class="old-syle-anchor">&nbsp;</a>
     <div class="method-section">
         <div class="method-description">
@@ -18308,7 +18314,7 @@ Request Body:
 			</code>
         </div>
     </div>
-		
+
 	<a id="savingsproducts_delete" name="savingsproducts_delete" class="old-syle-anchor">&nbsp;</a>
 	<div class="method-section">
 		<div class="method-description">
@@ -18329,12 +18335,12 @@ Content-Type: application/json
 			</code>
 		</div>
 	</div>
-    
+
     <a id="savingsproducts_list" name="savingsproducts_list" class="old-syle-anchor">&nbsp;</a>
     <div class="method-section">
         <div class="method-description">
             <h4>List Savings Products</h4>
-            <p>Example Requests:</p> 
+            <p>Example Requests:</p>
             <div class=apiClick>savingsproducts</div>
             <br><br>
             <div class=apiClick>savingsproducts?fields=name</div>
@@ -18399,7 +18405,7 @@ Content-Type: application/json
 	        <p>When creating fixed deposit accounts, the details from the fixed deposit product are used to auto fill details of the fixed deposit account application process.</p>
 	        <table class=matrixHeading>
 	            <tr class="matrixHeadingBG"><td><div class="mifosXHeading2">Field Descriptions</div></td></tr>
-				
+
 				<tr class=alt><td>name</td></tr>
 	            <tr><td class=fielddesc>The name of the product offering.</td></tr>
 
@@ -18430,7 +18436,7 @@ Content-Type: application/json
 	            <tr><td class=fielddesc>The interest calculation method used: 1=Daily Balance or 2=Average Daily Balance</td></tr>
 
 				<tr class=alt><td>interestCalculationDaysInYearType</td></tr>
-	            <tr><td class=fielddesc>The setting for number of days in year to use: 360=360 Days, 365=365 Days</td></tr>	
+	            <tr><td class=fielddesc>The setting for number of days in year to use: 360=360 Days, 365=365 Days</td></tr>
 
 	            <tr class=alt><td>lockinPeriodFrequency</td></tr>
 	            <tr><td class=fielddesc><b>Optional</b>: If provided, used along with <i>lockinPeriodFrequencyType</i> to indicate the length of time that the fixed deposit account is 'locked in' and premature closure is not allowed. e.g. <b>2</b> Months</td></tr>
@@ -18466,8 +18472,8 @@ Content-Type: application/json
 
 	            <tr class=alt><td>inMultiplesOfDepositTermTypeId</td></tr>
 	            <tr>
-	            	<td class=fielddesc><b>Optional</b>: If provided, used along with <i>inMultiplesOfDepositTerm</i> to indicate the allowed deposit periods after minimum deposit period. 0=Days, 1=Weeks, 2=Months, 3=Years  
-	            	e.g. If inMultiplesOfDepositTerm is <b>3</b> Months then the next allowed deposit period after minimum deposit of <b>6</b> Months should be <b>9</d> Months. 
+	            	<td class=fielddesc><b>Optional</b>: If provided, used along with <i>inMultiplesOfDepositTerm</i> to indicate the allowed deposit periods after minimum deposit period. 0=Days, 1=Weeks, 2=Months, 3=Years
+	            	e.g. If inMultiplesOfDepositTerm is <b>3</b> Months then the next allowed deposit period after minimum deposit of <b>6</b> Months should be <b>9</d> Months.
 	        		</td>
 	        	</tr>
 
@@ -18504,7 +18510,7 @@ Content-Type: application/json
             <table class=matrixHeading>
                 <tr class="matrixHeadingBG"><td><div class="mifosXHeading2">Mandatory Fields</div></td></tr>
                 <tr class=alt>
-                	<td>name, shortName, description, currencyCode, digitsAfterDecimal,inMultiplesOf, 
+                	<td>name, shortName, description, currencyCode, digitsAfterDecimal,inMultiplesOf,
                 		interestCompoundingPeriodType, interestCalculationType, interestCalculationDaysInYearType, minDepositTerm, minDepositTermTypeId, accountingRule</td>
                 </tr>
             </table>
@@ -18534,7 +18540,7 @@ Request Body:
   "digitsAfterDecimal": 2,
   "inMultiplesOf": 0,
   "locale": "en",
-  "interestCompoundingPeriodType": 1, 
+  "interestCompoundingPeriodType": 1,
   "interestPostingPeriodType":4,
   "interestCalculationType": 1,
   "interestCalculationDaysInYearType": "365",
@@ -18755,7 +18761,7 @@ Request Body:
       }
     ]
   }
-}	
+}
 			</code>
         </div>
     </div>
@@ -18782,7 +18788,7 @@ Request Body:
   "resourceId": 1,
   "changes": {
     "description": "Fixed deposit product new offerings",
-    "minDepositTerm": 5    
+    "minDepositTerm": 5
   }
 }
 			</code>
@@ -18814,7 +18820,7 @@ Content-Type: application/json
     <div class="method-section">
         <div class="method-description">
             <h4>List Fixed Deposit Products</h4>
-            <p>Example Requests:</p> 
+            <p>Example Requests:</p>
             <div class=apiClick>fixeddepositproducts</div>
             <br><br>
             <div class=apiClick>fixeddepositproducts?fields=name</div>
@@ -18849,7 +18855,7 @@ Content-Type: application/json
       "id": 3,
       "code": "deposit.term.savingsPeriodFrequencyType.years",
       "value": "Years"
-    },    
+    },
     "nominalAnnualInterestRate": 0,
     "interestCompoundingPeriodType": {
       "id": 4,
@@ -18892,7 +18898,7 @@ Content-Type: application/json
 	        <p>When creating recurring deposit accounts, the details from the recurring deposit product are used to auto fill details of the recurring deposit account application process.</p>
 	        <table class=matrixHeading>
 	            <tr class="matrixHeadingBG"><td><div class="mifosXHeading2">Field Descriptions</div></td></tr>
-				
+
 				<tr class=alt><td>name</td></tr>
 	            <tr><td class=fielddesc>The name of the product offering.</td></tr>
 
@@ -18923,7 +18929,7 @@ Content-Type: application/json
 	            <tr><td class=fielddesc>The interest calculation method used: 1=Daily Balance or 2=Average Daily Balance</td></tr>
 
 				<tr class=alt><td>interestCalculationDaysInYearType</td></tr>
-	            <tr><td class=fielddesc>The setting for number of days in year to use: 360=360 Days, 365=365 Days</td></tr>	
+	            <tr><td class=fielddesc>The setting for number of days in year to use: 360=360 Days, 365=365 Days</td></tr>
 
 	            <tr class=alt><td>lockinPeriodFrequency</td></tr>
 	            <tr><td class=fielddesc><b>Optional</b>: If provided, used along with <i>lockinPeriodFrequencyType</i> to indicate the length of time that the recurring deposit account is 'locked in' and premature closure is not allowed. e.g. <b>2</b> Months</td></tr>
@@ -18969,8 +18975,8 @@ Content-Type: application/json
 
 	            <tr class=alt><td>inMultiplesOfDepositTermTypeId</td></tr>
 	            <tr>
-	            	<td class=fielddesc><b>Optional</b>: If provided, used along with <i>inMultiplesOfDepositTerm</i> to indicate the allowed deposit periods after minimum deposit period. 0=Days, 1=Weeks, 2=Months, 3=Years  
-	            	e.g. If inMultiplesOfDepositTerm is <b>3</b> Months then the next allowed deposit period after minimum deposit of <b>6</b> Months should be <b>9</d> Months. 
+	            	<td class=fielddesc><b>Optional</b>: If provided, used along with <i>inMultiplesOfDepositTerm</i> to indicate the allowed deposit periods after minimum deposit period. 0=Days, 1=Weeks, 2=Months, 3=Years
+	            	e.g. If inMultiplesOfDepositTerm is <b>3</b> Months then the next allowed deposit period after minimum deposit of <b>6</b> Months should be <b>9</d> Months.
 	        		</td>
 	        	</tr>
 
@@ -19007,7 +19013,7 @@ Content-Type: application/json
             <table class=matrixHeading>
                 <tr class="matrixHeadingBG"><td><div class="mifosXHeading2">Mandatory Fields</div></td></tr>
                 <tr class=alt>
-                	<td>name, shortName, description, currencyCode, digitsAfterDecimal,inMultiplesOf, 
+                	<td>name, shortName, description, currencyCode, digitsAfterDecimal,inMultiplesOf,
                 		interestCompoundingPeriodType, interestCalculationType, interestCalculationDaysInYearType, minDepositTerm, minDepositTermTypeId, recurringDepositFrequency, recurringDepositFrequencyTypeId, accountingRule, depositAmount </td>
                 </tr>
             </table>
@@ -19037,7 +19043,7 @@ Request Body:
   "digitsAfterDecimal": 2,
   "inMultiplesOf": 0,
   "locale": "en",
-  "interestCompoundingPeriodType": 1, 
+  "interestCompoundingPeriodType": 1,
   "interestPostingPeriodType":4,
   "interestCalculationType": 1,
   "interestCalculationDaysInYearType": "365",
@@ -19272,7 +19278,7 @@ Request Body:
       }
     ]
   }
-}	
+}
 			</code>
         </div>
     </div>
@@ -19299,7 +19305,7 @@ Request Body:
   "resourceId": 1,
   "changes": {
     "description": "Recurring deposit product new offerings",
-    "minDepositTerm": 5    
+    "minDepositTerm": 5
   }
 }
 			</code>
@@ -19331,7 +19337,7 @@ Content-Type: application/json
     <div class="method-section">
         <div class="method-description">
             <h4>List Recuring Deposit Products</h4>
-            <p>Example Requests:</p> 
+            <p>Example Requests:</p>
             <div class=apiClick>recurringdepositproducts</div>
             <br><br>
             <div class=apiClick>recurringdepositproducts?fields=name</div>
@@ -19372,7 +19378,7 @@ Content-Type: application/json
       "id": 3,
       "code": "deposit.term.savingsPeriodFrequencyType.years",
       "value": "Years"
-    },    
+    },
     "interestCompoundingPeriodType": {
       "id": 4,
       "code": "savings.interest.period.savingsCompoundingInterestPeriodType.monthly",
@@ -19487,7 +19493,7 @@ Content-Type: application/json
 	            <tr><td class=fielddesc>The interest calculation method used: 1=Daily Balance or 2=Average Daily Balance</td></tr>
 
 				<tr class=alt><td>interestCalculationDaysInYearType</td></tr>
-	            <tr><td class=fielddesc>The setting for number of days in year to use: 360=360 Days, 365=365 Days</td></tr>	
+	            <tr><td class=fielddesc>The setting for number of days in year to use: 360=360 Days, 365=365 Days</td></tr>
 
 				<tr class=alt><td>minRequiredOpeningBalance</td></tr>
 	            <tr><td class=fielddesc><b>Optional</b>: If provided, sets the minimum deposit amount required to open a savings account e.g. <b>2,000</b></td></tr>
@@ -19518,8 +19524,8 @@ Content-Type: application/json
 	        <h2>Retrieve Savings Account Template:</h2>
 	            <p>This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:
 	                <ul>
-	                <li class=normalli>Field Defaults</li>   
-	                <li class=normalli>Allowed Value Lists</li>    
+	                <li class=normalli>Field Defaults</li>
+	                <li class=normalli>Allowed Value Lists</li>
 	                </ul>
 	            </p>
 	        <h4>Arguments</h4>
@@ -19884,8 +19890,8 @@ Request Body:
 {
   "clientId": 1,
   "productId": 1,
-  "locale": "en", 
-  "dateFormat": "dd MMMM yyyy", 
+  "locale": "en",
+  "dateFormat": "dd MMMM yyyy",
   "submittedOnDate": "01 March 2011"
 }
 			</code>
@@ -19896,8 +19902,8 @@ Request Body:
 {
   "clientId": 1,
   "productId": 1,
-  "locale": "en", 
-  "dateFormat": "dd MMMM yyyy", 
+  "locale": "en",
+  "dateFormat": "dd MMMM yyyy",
   "submittedOnDate": "01 March 2011",
   "accountNo": "SA000023",
   "externalId": "SYS-23"
@@ -19911,20 +19917,20 @@ Request Body:
   "clientId": 1,
   "productId": 1,
   "fieldOfficerId": 1,
-  "locale": "en", 
-  "dateFormat": "dd MMMM yyyy", 
+  "locale": "en",
+  "dateFormat": "dd MMMM yyyy",
   "submittedOnDate": "01 March 2013",
   "accountNo": "SA000023",
   "externalId": "SYS-23",
-  "nominalAnnualInterestRate": "5.65", 
+  "nominalAnnualInterestRate": "5.65",
   "interestCompoundingPeriodType": 1,
   "interestPostingPeriodType": 4,
   "interestCalculationType": 1,
   "interestCalculationDaysInYearType": 365,
-  "minRequiredOpeningBalance": "1,000", 
+  "minRequiredOpeningBalance": "1,000",
   "lockinPeriodFrequency": 6,
   "lockinPeriodFrequencyType": 2,
-  "allowOverdraft":true, 
+  "allowOverdraft":true,
   "overdraftLimit":5000,
   "charges":[{"id":"1"}]
 }
@@ -20052,7 +20058,7 @@ Request Body:
 	        </code>
 	    </div>
 	</div>
-	
+
 	<a id="savingsaccounts_unassignSavingsOfficer" name="savingsaccounts_unassignSavingsOfficer" class="old-syle-anchor">&nbsp;</a>
 	<div class="method-section">
 	    <div class="method-description">
@@ -20068,7 +20074,7 @@ Request Body:
 	dateFormat : "dd MMMM yyyy",
 	locale : "en",
 	unassignedDate : "05 September 2014"
-}				
+}
 			</code>
 	        <code class="method-response">
 {
@@ -20385,7 +20391,7 @@ Request Body:
     <div class="method-section">
         <div class="method-description">
             <h2>List savings applications/accounts</h2>
-            <p>Example Requests:</p> 
+            <p>Example Requests:</p>
             <div class=apiClick>savingsaccounts</div>
             <br><br>
             <div class=apiClick>savingsaccounts?fields=name</div>
@@ -20468,14 +20474,14 @@ Request Body:
 			</code>
         </div>
     </div>
-        
+
 	<a id="savingsaccounts_retrieve" name="savingsaccounts_retrieve" class="old-syle-anchor">&nbsp;</a>
 	<div class="method-section">
 	    <div class="method-description">
 	        <h2>Retrieve a savings application/account:</h2>
 	        <h4>Arguments</h4>
 	        <dl class="argument-list">
-	            <dt>associations</dt>        
+	            <dt>associations</dt>
 	            <dd>optional, <span>Either 'all' or a comma separated list of savings 'associations' (itemized below).</span></dd>
 	            <dd><br>Associations are just extra pieces of data that you might or might not want to retrieve.<br><br></dd>
 	            <dd><b>'all':</b> Gets data related to all associations e.g. ?associations=all.</dd>
@@ -20569,11 +20575,11 @@ Request Body:
 	    </div>
 	    <div class="method-example">
 	        <code class="method-declaration">PUT https://Domain Name/api/v1/savingsaccounts/{accountsId}</code>
-	        <code class="method-request">PUT savingsaccounts/1              
+	        <code class="method-request">PUT savingsaccounts/1
 Content-Type: application/json
 No Request Body:
 {
-	"locale": "en", 
+	"locale": "en",
 	"nominalAnnualInterestRate": "5.9999999999"
 }
 	        </code>
@@ -20600,7 +20606,7 @@ No Request Body:
 	    </div>
 	    <div class="method-example">
 	        <code class="method-declaration">DELETE https://Domain Name/api/v1/savingsaccounts/{accountsId}</code>
-	        <code class="method-request">DELETE savingsaccounts/1              
+	        <code class="method-request">DELETE savingsaccounts/1
 Content-Type: application/json
 No Request Body:
 	        </code>
@@ -20613,7 +20619,7 @@ No Request Body:
 	        </code>
 	    </div>
 	</div>
-	
+
 	<a id="savingsaccounts_transactions" name="savingsaccounts_transactions" class="old-syle-anchor">&nbsp;</a>
 	<div class="method-section">
 	    <div class="method-description">
@@ -20637,8 +20643,8 @@ No Request Body:
 	        <h2>Retrieve Savings Account Transaction Template:</h2>
 	            <p>This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:
 	                <ul>
-	                <li class=normalli>Field Defaults</li>   
-	                <li class=normalli>Allowed Value Lists</li>    
+	                <li class=normalli>Field Defaults</li>
+	                <li class=normalli>Allowed Value Lists</li>
 	                </ul>
 	            </p>
 	        <p>Example Requests: </p>
@@ -20688,8 +20694,8 @@ No Request Body:
 	        <h2>Retrieve Savings Account Transaction:</h2>
 	            <p>This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:
 	                <ul>
-	                <li class=normalli>Field Defaults</li>   
-	                <li class=normalli>Allowed Value Lists</li>    
+	                <li class=normalli>Field Defaults</li>
+	                <li class=normalli>Allowed Value Lists</li>
 	                </ul>
 	            </p>
 	        <p>Example Requests: </p>
@@ -20754,7 +20760,7 @@ No Request Body:
 	    </div>
 	    <div class="method-example">
 	        <code class="method-declaration">POST https://Domain Name/api/v1/savingsaccounts/{accountsId}/transactions?command=deposit</code>
-	        <code class="method-request">POST savingsaccounts/1/transactions?command=deposit              
+	        <code class="method-request">POST savingsaccounts/1/transactions?command=deposit
 Content-Type: application/json
 No Request Body:
 {
@@ -20795,7 +20801,7 @@ No Request Body:
 	    </div>
 	    <div class="method-example">
 	        <code class="method-declaration">POST https://Domain Name/api/v1/savingsaccounts/{accountsId}/transactions?command=withdrawal</code>
-	        <code class="method-request">POST savingsaccounts/1/transactions?command=withdrawal              
+	        <code class="method-request">POST savingsaccounts/1/transactions?command=withdrawal
 Content-Type: application/json
 No Request Body:
 {
@@ -20837,7 +20843,7 @@ No Request Body:
 	    </div>
 	    <div class="method-example">
 	        <code class="method-declaration">POST https://Domain Name/api/v1/savingsaccounts/{accountsId}/transactions/{transactionId}?command=modify</code>
-	        <code class="method-request">POST savingsaccounts/1/transactions/1?command=modify             
+	        <code class="method-request">POST savingsaccounts/1/transactions/1?command=modify
 Content-Type: application/json
 No Request Body:
 {
@@ -20880,7 +20886,7 @@ No Request Body:
 	    </div>
 	    <div class="method-example">
 	        <code class="method-declaration">POST https://Domain Name/api/v1/savingsaccounts/{accountsId}/transactions/{transactionId}?command=undo</code>
-	        <code class="method-request">POST savingsaccounts/1/transactions/1?command=undo              
+	        <code class="method-request">POST savingsaccounts/1/transactions/1?command=undo
 Content-Type: application/json
 No Request Body:
 {
@@ -20895,7 +20901,7 @@ No Request Body:
 }
 	        </code>
 	    </div>
-	</div>	
+	</div>
 <!-- end of savings accounts api -->
 
 <!-- start of Savings charges content-->
@@ -20905,10 +20911,10 @@ No Request Body:
 					<h3>Savings Charges</h3>
 					<p>Its typical for MFIs to add maintenance and operating charges. They can be either Fees or Penalties.
 					</p>
-					<p>Savings Charges are instances of <a href="#charges">Charges</a> and 
+					<p>Savings Charges are instances of <a href="#charges">Charges</a> and
 						represent either fees and penalties for savings products. Refer <a href="#charges">Charges</a>
 						for documentation of the various properties of a charge, Only additional properties (
-						specific to the context of a Charge being associated with a Savings account) are 
+						specific to the context of a Charge being associated with a Savings account) are
 						described here</p>
 					<table class=matrixHeading>
 						<tr class="matrixHeadingBG">
@@ -21328,7 +21334,7 @@ POST https://DomainName/api/v1/savingsaccounts/{accountId}/charges
                     </code>
                     <code class="method-request">
 POST /savingsaccounts/1/charges
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
   "chargeId": "2",
@@ -21348,7 +21354,7 @@ Request Body:
 	                </code>
 	                <code class="method-request">
 POST /savingsaccounts/1/charges
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
   "chargeId": "2",
@@ -21364,7 +21370,7 @@ Request Body:
   "clientId": 1,
   "savingsId": 1,
   "resourceId": 7
-}                
+}
 				</code>
                 </div>
             </div>
@@ -21374,7 +21380,7 @@ Request Body:
 			<div class="method-section">
 				<div class="method-description">
 					<h4>Update a Savings account Charge</h4>
-					<p>Currently Savings account Charges may be updated only if the Savings account 
+					<p>Currently Savings account Charges may be updated only if the Savings account
 						is not yet approved.
 					</p>
 				</div>
@@ -21384,8 +21390,8 @@ PUT https://DomainName/api/v1/savingsaccounts/{accountId}/charges/{savingsAccoun
 					</code>
 					<code class="method-request">
 PUT savingsaccounts/1/charges/6
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
   "dateFormat": "dd MMMM yyyy",
   "locale": "en",
@@ -21425,7 +21431,7 @@ DELETE https://DomainName/api/v1/savingsaccounts/{accountId}/charges/{savingsAcc
 					</code>
 					<code class="method-request">
 DELETE savingsaccounts/1/charges/2
-Content-Type: application/json 
+Content-Type: application/json
 No Request Body:
 					</code>
 					<code class="method-response">
@@ -21453,8 +21459,8 @@ POST https://DomainName/api/v1/savingsaccounts/{accountId}/charges/{savingsAccou
 					</code>
 					<code class="method-request">
 POST savingsaccounts/1/charges/2?command=paycharge
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
   "dateFormat": "dd MMMM yyyy",
   "locale": "en",
@@ -21487,8 +21493,8 @@ POST https://DomainName/api/v1/savingsaccounts/{accountId}/charges/{savingsAccou
 					</code>
 					<code class="method-request">
 POST savingsaccounts/1/charges/2?command=waive
-Content-Type: application/json 
-No Request Body: 
+Content-Type: application/json
+No Request Body:
 					</code>
 					<code class="method-response">
 {
@@ -21515,7 +21521,7 @@ POST https://DomainName/api/v1/savingsaccounts/{accountId}/charges/{savingsAccou
 					</code>
 					<code class="method-request">
 POST savingsaccounts/1/charges/2?command=inactivate
-Content-Type: application/json 
+Content-Type: application/json
 No Request Body:
 					</code>
 					<code class="method-response">
@@ -21529,7 +21535,7 @@ No Request Body:
 				</div>
 			</div>
 
-<!-- End of Savings account charges -->			
+<!-- End of Savings account charges -->
 
 <!-- start of fixed deposit accounts api -->
 	<a id="fdaccounts" name="fdaccounts" class="old-syle-anchor">&nbsp;</a>
@@ -21611,7 +21617,7 @@ No Request Body:
 	            <tr><td class=fielddesc>The interest calculation method used: 1=Daily Balance or 2=Average Daily Balance</td></tr>
 
 				<tr class=alt><td>interestCalculationDaysInYearType</td></tr>
-	            <tr><td class=fielddesc>The setting for number of days in year to use: 360=360 Days, 365=365 Days</td></tr>	
+	            <tr><td class=fielddesc>The setting for number of days in year to use: 360=360 Days, 365=365 Days</td></tr>
 
 	            <tr class=alt><td>lockinPeriodFrequency</td></tr>
 	            <tr><td class=fielddesc><b>Optional</b>: If provided, used along with <i>lockinPeriodFrequencyType</i> to indicate the length of time that the fixed deposit account is 'locked in' and withdrawals are not allowed. e.g. <b>6</b> Months</td></tr>
@@ -21660,8 +21666,8 @@ No Request Body:
 
 	            <tr class=alt><td>inMultiplesOfDepositTermTypeId</td></tr>
 	            <tr>
-	            	<td class=fielddesc><b>Optional</b>: If provided, used along with <i>inMultiplesOfDepositTerm</i> to indicate the allowed deposit periods after minimum deposit period. 0=Days, 1=Weeks, 2=Months, 3=Years  
-	            	e.g. If inMultiplesOfDepositTerm is <b>3</b> Months then the next allowed deposit period after minimum deposit of <b>6</b> Months should be <b>9</d> Months. 
+	            	<td class=fielddesc><b>Optional</b>: If provided, used along with <i>inMultiplesOfDepositTerm</i> to indicate the allowed deposit periods after minimum deposit period. 0=Days, 1=Weeks, 2=Months, 3=Years
+	            	e.g. If inMultiplesOfDepositTerm is <b>3</b> Months then the next allowed deposit period after minimum deposit of <b>6</b> Months should be <b>9</d> Months.
 	        		</td>
 	        	</tr>
 
@@ -21690,8 +21696,8 @@ No Request Body:
 	        <h2>Retrieve Fixed Deposit Account Template:</h2>
 	            <p>This is a convenience resource. It can be useful when building maintenance user interface screens for fixed deposit applications. The template data returned consists of any or all of:
 	                <ul>
-	                <li class=normalli>Field Defaults</li>   
-	                <li class=normalli>Allowed Value Lists</li>    
+	                <li class=normalli>Field Defaults</li>
+	                <li class=normalli>Allowed Value Lists</li>
 	                </ul>
 	            </p>
 	        <h4>Arguments</h4>
@@ -22056,8 +22062,8 @@ Request Body:
 {
   "clientId": 1,
   "productId": 1,
-  "locale": "en", 
-  "dateFormat": "dd MMMM yyyy", 
+  "locale": "en",
+  "dateFormat": "dd MMMM yyyy",
   "submittedOnDate": "01 March 2014",
   "depositAmount":"5000",
   "depositPeriod":"6",
@@ -22071,8 +22077,8 @@ Request Body:
 {
   "clientId": 1,
   "productId": 1,
-  "locale": "en", 
-  "dateFormat": "dd MMMM yyyy", 
+  "locale": "en",
+  "dateFormat": "dd MMMM yyyy",
   "submittedOnDate": "01 March 2014",
   "depositAmount":"5000",
   "depositPeriod":"6",
@@ -22089,8 +22095,8 @@ Request Body:
   "clientId": 1,
   "productId": 1,
   "fieldOfficerId": 1,
-  "locale": "en", 
-  "dateFormat": "dd MMMM yyyy", 
+  "locale": "en",
+  "dateFormat": "dd MMMM yyyy",
   "submittedOnDate": "01 March 2014",
   "accountNo": "FD000024",
   "externalId": "FD-24",
@@ -22596,7 +22602,7 @@ Request Body:
     <div class="method-section">
         <div class="method-description">
             <h2>List Fixed deposit applications/accounts</h2>
-            <p>Example Requests:</p> 
+            <p>Example Requests:</p>
             <div class=apiClick>fixeddepositaccounts</div>
             <br><br>
             <div class=apiClick>fixeddepositaccounts?fields=name</div>
@@ -22718,7 +22724,7 @@ Request Body:
 	        <h2>Retrieve a fixed deposit application/account:</h2>
 	        <h4>Arguments</h4>
 	        <dl class="argument-list">
-	            <dt>associations</dt>        
+	            <dt>associations</dt>
 	            <dd>optional, <span>Either 'all' or a comma separated list of fixed deposit 'associations' (itemized below).</span></dd>
 	            <dd><br>Associations are just extra pieces of data that you might or might not want to retrieve.<br><br></dd>
 	            <dd><b>'all':</b> Gets data related to all associations e.g. ?associations=all.</dd>
@@ -22937,11 +22943,11 @@ Request Body:
 	    </div>
 	    <div class="method-example">
 	        <code class="method-declaration">PUT https://Domain Name/api/v1/fixeddepositaccounts/{accountId}</code>
-	        <code class="method-request">PUT fixeddepositaccounts/1              
+	        <code class="method-request">PUT fixeddepositaccounts/1
 Content-Type: application/json
 No Request Body:
 {
-	"locale": "en", 
+	"locale": "en",
 	"depositAmount": 6000
 }
 	        </code>
@@ -22968,7 +22974,7 @@ No Request Body:
 	    </div>
 	    <div class="method-example">
 	        <code class="method-declaration">DELETE https://Domain Name/api/v1/fixeddepositaccounts/{accountsId}</code>
-	        <code class="method-request">DELETE fixeddepositaccounts/1              
+	        <code class="method-request">DELETE fixeddepositaccounts/1
 Content-Type: application/json
 No Request Body:
 	        </code>
@@ -23064,7 +23070,7 @@ No Request Body:
 	            <tr><td class=fielddesc>The interest calculation method used: 1=Daily Balance or 2=Average Daily Balance</td></tr>
 
 				<tr class=alt><td>interestCalculationDaysInYearType</td></tr>
-	            <tr><td class=fielddesc>The setting for number of days in year to use: 360=360 Days, 365=365 Days</td></tr>	
+	            <tr><td class=fielddesc>The setting for number of days in year to use: 360=360 Days, 365=365 Days</td></tr>
 
 	            <tr class=alt><td>lockinPeriodFrequency</td></tr>
 	            <tr><td class=fielddesc><b>Optional</b>: If provided, used along with <i>lockinPeriodFrequencyType</i> to indicate the length of time that the recurring deposit account is 'locked in' and withdrawals are not allowed. e.g. <b>6</b> Months</td></tr>
@@ -23123,8 +23129,8 @@ No Request Body:
 
 	            <tr class=alt><td>inMultiplesOfDepositTermTypeId</td></tr>
 	            <tr>
-	            	<td class=fielddesc><b>Optional</b>: If provided, used along with <i>inMultiplesOfDepositTerm</i> to indicate the allowed deposit periods after minimum deposit period. 0=Days, 1=Weeks, 2=Months, 3=Years  
-	            	e.g. If inMultiplesOfDepositTerm is <b>3</b> Months then the next allowed deposit period after minimum deposit of <b>6</b> Months should be <b>9</d> Months. 
+	            	<td class=fielddesc><b>Optional</b>: If provided, used along with <i>inMultiplesOfDepositTerm</i> to indicate the allowed deposit periods after minimum deposit period. 0=Days, 1=Weeks, 2=Months, 3=Years
+	            	e.g. If inMultiplesOfDepositTerm is <b>3</b> Months then the next allowed deposit period after minimum deposit of <b>6</b> Months should be <b>9</d> Months.
 	        		</td>
 	        	</tr>
 
@@ -23153,8 +23159,8 @@ No Request Body:
 	        <h2>Retrieve recurring Deposit Account Template:</h2>
 	            <p>This is a convenience resource. It can be useful when building maintenance user interface screens for recurring deposit applications. The template data returned consists of any or all of:
 	                <ul>
-	                <li class=normalli>Field Defaults</li>   
-	                <li class=normalli>Allowed Value Lists</li>    
+	                <li class=normalli>Field Defaults</li>
+	                <li class=normalli>Allowed Value Lists</li>
 	                </ul>
 	            </p>
 	        <h4>Arguments</h4>
@@ -23519,8 +23525,8 @@ Request Body:
 {
   "clientId": 1,
   "productId": 1,
-  "locale": "en", 
-  "dateFormat": "dd MMMM yyyy", 
+  "locale": "en",
+  "dateFormat": "dd MMMM yyyy",
   "submittedOnDate": "02 June 2014",
   "depositPeriod":"20",
   "depositPeriodFrequencyId":"1",
@@ -23538,8 +23544,8 @@ Request Body:
 {
   "clientId": 1,
   "productId": 1,
-  "locale": "en", 
-  "dateFormat": "dd MMMM yyyy", 
+  "locale": "en",
+  "dateFormat": "dd MMMM yyyy",
   "submittedOnDate": "02 June 2014",
   "depositPeriod":"20",
   "depositPeriodFrequencyId":"1",
@@ -23554,7 +23560,7 @@ Request Body:
   "allowWithdrawal":false,
   "adjustAdvanceTowardsFuturePayments":false,
   "isMandatoryDeposit":false
-  
+
 }
 			</code>
 			<p>Full request: accountNo provided (must be unique), remaining details override details from recurring deposit product (except currency).</p>
@@ -23565,8 +23571,8 @@ Request Body:
   "clientId": 1,
   "productId": 1,
   "fieldOfficerId": 1,
-  "locale": "en", 
-  "dateFormat": "dd MMMM yyyy", 
+  "locale": "en",
+  "dateFormat": "dd MMMM yyyy",
   "submittedOnDate": "02 June 2014",
   "depositPeriod":"20",
   "depositPeriodFrequencyId":"1",
@@ -24201,7 +24207,7 @@ Request Body:
     <div class="method-section">
         <div class="method-description">
             <h2>List Fixed deposit applications/accounts</h2>
-            <p>Example Requests:</p> 
+            <p>Example Requests:</p>
             <div class=apiClick>recurringdepositaccounts</div>
             <br><br>
             <div class=apiClick>recurringdepositaccounts?fields=name</div>
@@ -24336,7 +24342,7 @@ Request Body:
 	        <h2>Retrieve a recurring deposit application/account:</h2>
 	        <h4>Arguments</h4>
 	        <dl class="argument-list">
-	            <dt>associations</dt>        
+	            <dt>associations</dt>
 	            <dd>optional, <span>Either 'all' or a comma separated list of recurring deposit 'associations' (itemized below).</span></dd>
 	            <dd><br>Associations are just extra pieces of data that you might or might not want to retrieve.<br><br></dd>
 	            <dd><b>'all':</b> Gets data related to all associations e.g. ?associations=all.</dd>
@@ -24429,7 +24435,7 @@ Request Body:
   "recurringDepositAmount": 100,
   "recurringDepositFrequency": 1,
   "expectedFirstDepositOnDate": [
-  	2014, 
+  	2014,
   	4,
    	2
    ],
@@ -24559,11 +24565,11 @@ Request Body:
 	    </div>
 	    <div class="method-example">
 	        <code class="method-declaration">PUT https://Domain Name/api/v1/recurringdepositaccounts/{accountId}</code>
-	        <code class="method-request">PUT recurringdepositaccounts/1              
+	        <code class="method-request">PUT recurringdepositaccounts/1
 Content-Type: application/json
 No Request Body:
 {
-	"locale": "en", 
+	"locale": "en",
 	"depositAmount": 6000
 }
 	        </code>
@@ -24590,7 +24596,7 @@ No Request Body:
 	    </div>
 	    <div class="method-example">
 	        <code class="method-declaration">DELETE https://Domain Name/api/v1/recurringdepositaccounts/{accountsId}</code>
-	        <code class="method-request">DELETE recurringdepositaccounts/1              
+	        <code class="method-request">DELETE recurringdepositaccounts/1
 Content-Type: application/json
 No Request Body:
 	        </code>
@@ -24626,8 +24632,8 @@ No Request Body:
 	        <h2>Retrieve Recurring Deposit Account Transaction Template:</h2>
 	            <p>This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:
 	                <ul>
-	                <li class=normalli>Field Defaults</li>   
-	                <li class=normalli>Allowed Value Lists</li>    
+	                <li class=normalli>Field Defaults</li>
+	                <li class=normalli>Allowed Value Lists</li>
 	                </ul>
 	            </p>
 	        <p>Example Requests: </p>
@@ -24747,7 +24753,7 @@ No Request Body:
 	    </div>
 	    <div class="method-example">
 	        <code class="method-declaration">POST https://Domain Name/api/v1/recurringdepositaccounts/{accountsId}/transactions?command=deposit</code>
-	        <code class="method-request">POST recurringdepositaccounts/1/transactions?command=deposit              
+	        <code class="method-request">POST recurringdepositaccounts/1/transactions?command=deposit
 Content-Type: application/json
 No Request Body:
 {
@@ -24830,7 +24836,7 @@ No Request Body:
 	    </div>
 	    <div class="method-example">
 	        <code class="method-declaration">POST https://Domain Name/api/v1/recurringdepositaccounts/{accountsId}/transactions/{transactionId}?command=modify</code>
-	        <code class="method-request">POST recurringdepositaccounts/1/transactions/1?command=modify             
+	        <code class="method-request">POST recurringdepositaccounts/1/transactions/1?command=modify
 Content-Type: application/json
 No Request Body:
 {
@@ -24872,7 +24878,7 @@ No Request Body:
 	    </div>
 	    <div class="method-example">
 	        <code class="method-declaration">POST https://Domain Name/api/v1/recurringdepositaccounts/{accountsId}/transactions/{transactionId}?command=undo</code>
-	        <code class="method-request">POST recurringdepositaccounts/1/transactions/1?command=undo              
+	        <code class="method-request">POST recurringdepositaccounts/1/transactions/1?command=undo
 Content-Type: application/json
 No Request Body:
 {
@@ -24942,8 +24948,8 @@ No Request Body:
 	        <h2>Retrieve Account Transfer Template:</h2>
 	            <p>This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:
 	                <ul>
-	                <li class=normalli>Field Defaults</li>   
-	                <li class=normalli>Allowed Value Lists</li>    
+	                <li class=normalli>Field Defaults</li>
+	                <li class=normalli>Allowed Value Lists</li>
 	                </ul>
 	            </p>
 	        <p>Example Requests:</p>
@@ -24953,7 +24959,7 @@ No Request Body:
 	        <br/>
 	        <div class=apiClick>accounttransfers/template?fromClientId=1&fromAccountType=2&fromAccountId=1</div>
 	        <br/>
-	    </div> 
+	    </div>
 	    <div class="method-example">
 	        <code class="method-declaration">GET https://Domain Name/api/v1/accounttransfers/template?fromAccountType=2&fromOfficeId=1
 	        </code>
@@ -25370,7 +25376,7 @@ No Request Body:
 	    </div>
 	    <div class="method-example">
 	        <code class="method-declaration">POST https://Domain Name/api/v1/accounttransfers</code>
-	        <code class="method-request">POST accounttransfers/              
+	        <code class="method-request">POST accounttransfers/
 Content-Type: application/json
 No Request Body:
 {
@@ -25382,7 +25388,7 @@ No Request Body:
 "toClientId": 1,
 "toAccountType": 2,
 "toAccountId": 2,
-"dateFormat": "dd MMMM yyyy", 
+"dateFormat": "dd MMMM yyyy",
 "locale": "en",
 "transferDate": "01 August 2011",
 "transferAmount": "112.45",
@@ -25402,7 +25408,7 @@ No Request Body:
     <div class="method-section">
         <div class="method-description">
             <h2>List account transfers</h2>
-            <p>Example Requests:</p> 
+            <p>Example Requests:</p>
             <div class=apiClick>accounttransfers</div>
             <br>
         </div>
@@ -25645,7 +25651,7 @@ No Request Body:
 			</code>
         </div>
     </div>
-        
+
 	<a id="accounttransfers_retrieve" name="accounttransfers_retrieve" class="old-syle-anchor">&nbsp;</a>
 	<div class="method-section">
 	    <div class="method-description">
@@ -25717,7 +25723,7 @@ No Request Body:
 	        </code>
 	    </div>
 	</div>
-	
+
 		<a id="accounttransfers_retrieve_template_refund_by_transfer" name="accounttransfers_retrieve_template_refund_by_transfer" class="old-syle-anchor">&nbsp;</a>
 	<div class="method-section">
 	    <div class="method-description">
@@ -25958,8 +25964,8 @@ No Request Body:
 	        </code>
 	    </div>
 	</div>
-	
-	
+
+
 		<a id="accounttransfers_refund_by_transfer" name="accounttransfers_refund_by_transfer" class="old-syle-anchor">&nbsp;</a>
 	<div class="method-section">
 	    <div class="method-description">
@@ -25968,7 +25974,7 @@ No Request Body:
 	    </div>
 	    <div class="method-example">
 	        <code class="method-declaration">POST https://Domain Name/api/v1/accounttransfers</code>
-	        <code class="method-request">POST refundByTransfer/              
+	        <code class="method-request">POST refundByTransfer/
 Content-Type: application/json
 No Request Body:
 {
@@ -26084,8 +26090,8 @@ No Request Body:
 	        <h2>Retrieve Standing Instruction Template:</h2>
 	            <p>This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:
 	                <ul>
-	                <li class=normalli>Field Defaults</li>   
-	                <li class=normalli>Allowed Value Lists</li>    
+	                <li class=normalli>Field Defaults</li>
+	                <li class=normalli>Allowed Value Lists</li>
 	                </ul>
 	            </p>
 	        <p>Example Requests:</p>
@@ -26095,7 +26101,7 @@ No Request Body:
 	        <br/>
 	        <div class=apiClick>standinginstructions/template?fromClientId=1&fromAccountType=2&fromAccountId=1&transferType=1</div>
 	        <br/>
-	    </div> 
+	    </div>
 	    <div class="method-example">
 	        <code class="method-declaration">GET https://Domain Name/api/v1/standinginstructions/template?fromAccountType=2&fromOfficeId=1
 	        </code>
@@ -26931,7 +26937,7 @@ No Request Body:
 	    </div>
 	    <div class="method-example">
 	        <code class="method-declaration">POST https://Domain Name/api/v1/standinginstructions</code>
-	        <code class="method-request">POST standinginstructions/              
+	        <code class="method-request">POST standinginstructions/
 Content-Type: application/json
 No Request Body:
 {
@@ -26961,7 +26967,7 @@ No Request Body:
 	        </code>
 	        <code class="method-response">
 {
-  	
+
 "clientId":1,
 "resourceId":65
 }
@@ -26977,7 +26983,7 @@ No Request Body:
 	    </div>
 	    <div class="method-example">
 	        <code class="method-declaration">PUT https://Domain Name/api/v1/standinginstructions/1?command=update</code>
-	        <code class="method-request">PUT standinginstructions/1?command=update       
+	        <code class="method-request">PUT standinginstructions/1?command=update
 Content-Type: application/json
 No Request Body:
 {
@@ -27003,11 +27009,11 @@ No Request Body:
 	    </div>
 	    <div class="method-example">
 	        <code class="method-declaration">PUT https://Domain Name/api/v1/standinginstructions/1?command=delete</code>
-	        <code class="method-request">PUT standinginstructions/1?command=delete       
+	        <code class="method-request">PUT standinginstructions/1?command=delete
 Content-Type: application/json
 No Request Body:
 {
-	
+
 }
 	        </code>
 	        <code class="method-response">
@@ -27025,7 +27031,7 @@ No Request Body:
     <div class="method-section">
         <div class="method-description">
             <h2>List Standing Instructions</h2>
-            <p>Example Requests:</p> 
+            <p>Example Requests:</p>
             <div class=apiClick>standinginstructions</div>
             <br>
         </div>
@@ -27215,7 +27221,7 @@ No Request Body:
 }			</code>
         </div>
     </div>
-        
+
 	<a id="standinginstructions_retrieve" name="standinginstructions_retrieve" class="old-syle-anchor">&nbsp;</a>
 	<div class="method-section">
 	    <div class="method-description">
@@ -27318,7 +27324,7 @@ No Request Body:
 	        </code>
 	    </div>
 	</div>
-        
+
 	<a id="standinginstructions_history" name="standinginstructions_history" class="old-syle-anchor">&nbsp;</a>
 	<div class="method-section">
 	    <div class="method-description">
@@ -27528,7 +27534,7 @@ No Request Body:
 	</div>
 
 <!-- End Account Trasfer Standing Instrution-->
-    
+
 <!-- start of datatables api docs -->
 			<a id="datatables" name="datatables" class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
@@ -27690,7 +27696,7 @@ Request Body:
 					<code class="method-response">
 {
   "resourceIdentifier": "extra_client_details"
-} 
+}
 				</code>
                 <code class="method-request">
 POST https://DomainName/api/v1/datatables
@@ -28059,7 +28065,7 @@ Request Body:
 					<code class="method-response">
 {
   "resourceIdentifier": "extra_client_details"
-} 
+}
 				</code>
 				</div>
 			</div>
@@ -28085,7 +28091,7 @@ No Request Body
 					<code class="method-response">
 {
   "resourceIdentifier": "extra_client_details"
-} 
+}
 				</code>
             </div>
 
@@ -28107,16 +28113,16 @@ No Request Body
 POST https://DomainName/api/v1/datatables/register/{datatable}/{apptable}
 					</code>
 					<code class="method-request">
-POST datatables/register/extra_client_details/m_client 
+POST datatables/register/extra_client_details/m_client
 
-Content-Type: application/json 
-Request Body: 
-{} 
+Content-Type: application/json
+Request Body:
+{}
 					</code>
 					<code class="method-response">
 {
   "resourceIdentifier": "extra_client_details"
-} 
+}
 				</code>
 				</div>
 			</div>
@@ -28134,11 +28140,11 @@ Request Body:
 POST https://DomainName/api/v1/datatables/deregister/{datatable}
 					</code>
 					<code class="method-request">
-POST datatables/deregister/extra_client_details 
+POST datatables/deregister/extra_client_details
 
-Content-Type: application/json 
-Request Body: 
-{} 
+Content-Type: application/json
+Request Body:
+{}
 					</code>
 					<code class="method-response">
 {
@@ -28166,26 +28172,26 @@ Request Body:
 POST https://DomainName/api/v1/datatables/{datatable}/{apptableId}
 					</code>
 					<code class="method-request">
-POST datatables/extra_client_details/1 
+POST datatables/extra_client_details/1
 
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
-	"Business Description": "Livestock sales", 
-	"Comment": "First	comment made", 
-	"Education_cv": "Primary", 
-	"Gender_cd": "6", 
-	"Highest Rate Paid": "8.5", 
-	"Next Visit": "01 October 2012", 
-	"Years in Business": "5", 
-	"dateFormat": "dd MMMM yyyy", 
-	"locale": "en" 
+	"Business Description": "Livestock sales",
+	"Comment": "First	comment made",
+	"Education_cv": "Primary",
+	"Gender_cd": "6",
+	"Highest Rate Paid": "8.5",
+	"Next Visit": "01 October 2012",
+	"Years in Business": "5",
+	"dateFormat": "dd MMMM yyyy",
+	"locale": "en"
 }
 					</code>
 					<code class="method-response">
 {
 	"resourceId": 1
-} 
+}
 					</code>
 				</div>
 			</div>
@@ -28361,9 +28367,9 @@ GET https://DomainName/api/v1/datatables/{datatable}/{apptableId}?genericResultS
 PUT https://DomainName/api/v1/datatables/{datatable}/{apptableId}
 					</code>
 					<code class="method-request">
-PUT datatables/extra_client_details/1 
+PUT datatables/extra_client_details/1
 
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
     "Business Description": "Livestock sales updated",
@@ -28392,19 +28398,19 @@ Request Body:
 PUT https://DomainName/api/v1/datatables/{datatable}/{apptableId}/{datatableId}
 					</code>
 					<code class="method-request">
-PUT datatables/Extra Family Details Data/1/2 
+PUT datatables/Extra Family Details Data/1/2
 
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
-	"Date of Birth": "01 June 1982", 
-	Education_cdHighest: "5", 
-	Name: "June", 
-	"Other Notes": "More\nnotes", 
+	"Date of Birth": "01 June 1982",
+	Education_cdHighest: "5",
+	Name: "June",
+	"Other Notes": "More\nnotes",
 	"Points Score": "20",
-	dateFormat: "dd MMMM yyyy", 
-	locale: "en" 
-} 
+	dateFormat: "dd MMMM yyyy",
+	locale: "en"
+}
 					</code>
 					<code class="method-response">{ "resourceId": 1 } </code>
 				</div>
@@ -28424,14 +28430,14 @@ Request Body:
 DELETE https://DomainName/api/v1/datatables/{datatable}/{apptableId}
 					</code>
 					<code class="method-request">
-DELETE datatables/extra_client_details/1 
+DELETE datatables/extra_client_details/1
 
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {}
 					 </code>
 					<code class="method-response">
-{ 
+{
 	"resourceId": 1
 }
 					</code>
@@ -28451,10 +28457,10 @@ Request Body:
 DELETE https://DomainName/api/v1/datatables/{datatable}/{apptableId}/{datatableId}
 					</code>
 					<code class="method-request">
-DELETE datatables/extra_family_details/1/2 
+DELETE datatables/extra_family_details/1/2
 
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {}
 					</code>
 					<code class="method-response">
@@ -28467,7 +28473,7 @@ Request Body:
 			<!-- end of datatables api docs -->
 
 			<!-- start of survey api docs -->
- 
+
              <a id="survey_retrieve" name="survey_retrieve"
                 class="old-syle-anchor">&nbsp;</a>
              <div class="method-section">
@@ -28482,7 +28488,7 @@ Request Body:
                      </code>
                      <code class="method-request">
                          GET survey/
- 
+
                          Content-Type: application/json
                          Request Body:
                          {}
@@ -28535,7 +28541,7 @@ Request Body:
                              "value": "Six",
                              "score": 8
                              },
- 
+
                          ],
                      "columnCode": "ppi_household_members"
                      },
@@ -28588,7 +28594,7 @@ Request Body:
                      "value": "four or More",
                      "score": 0
                      },
- 
+
                      ],
                      "columnCode": "ppi_youngerthan17"
                      },
@@ -28603,8 +28609,8 @@ Request Body:
                      </code>
                  </div>
              </div>
- 
- 
+
+
              <a id="survey_details" name="survey_details"
                 class="old-syle-anchor">&nbsp;</a>
              <div class="method-section">
@@ -28619,7 +28625,7 @@ Request Body:
                      </code>
                      <code class="method-request">
                          GET survey/{surveyName}
- 
+
                          Content-Type: application/json
                          Request Body:
                          {}
@@ -28671,14 +28677,14 @@ Request Body:
                      </code>
                  </div>
              </div>
- 
+
              <a id="survey_create" name="survey_create"
                 class="old-syle-anchor">&nbsp;</a>
              <div class="method-section">
                  <div class="method-description">
                      <h4>Create an entry in the survey table</h4>
                      <p>Insert and entry in a survey table (full fill the survey).
- 
+
                      </p>
                  </div>
                  <div class="method-example">
@@ -28687,11 +28693,11 @@ Request Body:
                      </code>
                      <code class="method-request">
                          POST survey/{surveyName}/{clientId}
- 
+
                          Content-Type: application/json
                          Request Body:
                          {
- 
+
                                  ppi_household_members_cd_q1_householdmembers : 167,
                                  ppi_highestschool_cd_q2_highestschool : 174 ,
                                  ppi_businessoccupation_cd_q3_businessoccupation : 180,
@@ -28705,7 +28711,7 @@ Request Body:
                                  date:"2014-12-02 20:30:00",
                                  dateFormat:"Y-m-d H:i:s",
                                  locale:"en_GB"
- 
+
                          }
                      </code>
                      <code class="method-response">
@@ -28717,10 +28723,10 @@ Request Body:
                      </code>
                  </div>
              </div>
- 
- 
+
+
              <!-- end of Survey api docs -->
-			
+
 			<!-- start of Notes api docs -->
 			<a id="notes" name="notes" class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
@@ -28758,8 +28764,8 @@ Request Body:
 						</tr>
 					</table>
 				</div>
-			</div>			
-			
+			</div>
+
 			<a id="resources_addnote" name="resources_addnote"
 				class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
@@ -28786,11 +28792,11 @@ POST https://DomainName/api/v1/{resource}/{resourceId}/notes
 					</code>
 					<code class="method-request">
 POST clients/1/notes
-Content-Type: application/json 
-Request Body: 
-{ 
+Content-Type: application/json
+Request Body:
+{
 	"note": "a note about the client"
-} 
+}
 					</code>
 					<code class="method-response">
 {
@@ -28801,7 +28807,7 @@ Request Body:
 					</code>
 				</div>
 			</div>
-			
+
 			<a id="resource_notelist" name="resource_notelist"
 				class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
@@ -28842,7 +28848,7 @@ GET https://DomainName/api/v1/{resource}/{resourceId}/notes
 					</code>
 				</div>
 			</div>
-			
+
 			<a id="resources_retrievenote" name="resources_retrievenote"
 				class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
@@ -28897,10 +28903,10 @@ PUT https://DomainName/api/v1/{resource}/{resourceId}/notes/{noteId}
 					</code>
 					<code class="method-request">
 PUT clients/1/notes/76
-Content-Type: application/json 
-Request Body: 
-{ 
-	"note": "and here the note is updated nicely." 
+Content-Type: application/json
+Request Body:
+{
+	"note": "and here the note is updated nicely."
 }
 					</code>
 					<code class="method-response">
@@ -28928,7 +28934,7 @@ DELETE https://DomainName/api/v1/{resource}/{resourceId}/notes/{noteId}
 					</code>
 					<code class="method-request">
 DELETE clients/1/notes/76
-Content-Type: application/json 
+Content-Type: application/json
 No Request Body:
 					</code>
 					<code class="method-response">
@@ -28938,7 +28944,7 @@ No Request Body:
 					</code>
 				</div>
 			</div>
-			
+
 			<!-- end of Notes api docs -->
 
 			<!-- start of documents api docs -->
@@ -28947,7 +28953,7 @@ No Request Body:
 				<div class="method-description">
 					<h3>Documents</h3>
 					<p>Multiple Documents (a combination of a name, description
-						and a file) may be attached to different Entities 
+						and a file) may be attached to different Entities
 						like Clients, Groups, Staff, Loans, Savings and Client
 						Identifiers in the system
 					</p>
@@ -28979,7 +28985,7 @@ No Request Body:
 						</tr>
 						<tr>
 							<td class=fielddesc>The ID of the entity (client,
-								loan etc) with which this document is 
+								loan etc) with which this document is
 								associated</td>
 						</tr>
 						<tr class=alt>
@@ -29119,7 +29125,7 @@ GET https://DomainName/api/v1/documents/{clientId}
 							</tr>
 							<tr>
 								<td class=fielddesc>The file to be uploaded
-								</td>							
+								</td>
 							</tr>
 						</table>
 					</p>
@@ -29138,7 +29144,7 @@ POST https://DomainName/api/v1/{entityType}/{entityId}/documents
 					</code>
 					<code class="method-request">
 POST clients/1/documents
-Content-Type: multipart/form-data 
+Content-Type: multipart/form-data
 Request Body:
 <i>Not Shown (multi-part form data)</i>
 					</code>
@@ -29181,7 +29187,7 @@ Request Body:
 							</tr>
 							<tr>
 								<td class=fielddesc>The file to be uploaded
-								</td>							
+								</td>
 							</tr>
 						</table>
 					</p>
@@ -29191,8 +29197,8 @@ Request Body:
 PUT https://DomainName/api/v1/{entityType}/{entityId}/documents/{documentId}
 						</code>
 					<code class="method-request">
-PUT clients/1/documents/1 
-Content-Type: multipart/form-data 
+PUT clients/1/documents/1
+Content-Type: multipart/form-data
 Request Body:
 <i>Not Shown (multi-part form data)</i>
 					</code>
@@ -29239,7 +29245,7 @@ DELETE https://DomainName/api/v1/{entityType}/{entityId}/documents/{documentId}
 					</code>
 					<code class="method-request">
 DELETE clients/1/documents/1
-Content-Type: application/json 
+Content-Type: application/json
 No Request Body:
 					</code>
 					<code class="method-response">
@@ -29256,7 +29262,7 @@ DELETE https://DomainName/api/v1/{entityType}/{entityId}/documents/{documentId}
 					</code>
 					<code class="method-request">
 DELETE loans/1/documents/1
-Content-Type: application/json 
+Content-Type: application/json
 No Request Body:
 					</code>
 					<code class="method-response">
@@ -29299,7 +29305,7 @@ No Request Body:
                                         Note: <br>
                                         The reports api allows parameters (not just placeholders in reportSql) to be associated with reports.
                                         These associated parameters are only required to allow the reference UI reporting functionality implement
-                                        user-friendly parameter input.                                        
+                                        user-friendly parameter input.
                                         </p>
 				</div>
 			</div>
@@ -29393,8 +29399,8 @@ POST https://DomainName/api/v1/reports
 					</code>
 					<code class="method-request">
 POST reports
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
  "reportName":"Completely New Report",
  "reportType":"Table",
@@ -29407,9 +29413,9 @@ Request Body:
 }
 					</code>
 					<code class="method-response">
-{ 
+{
 	"resourceId": 132
-} 
+}
 					</code>
 				</div>
 			</div>
@@ -29540,8 +29546,8 @@ PUT https://DomainName/api/v1/reports/{id}
 					</code>
 					<code class="method-request">
 PUT reports/129
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
   "reportName": "New rpt name",
   "reportParameters": [
@@ -29580,8 +29586,8 @@ DELETE https://DomainName/api/v1/reports/{id}
 					</code>
 					<code class="method-request">
 DELETE reports/100
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {}
 					</code>
 					<code class="method-response">
@@ -29800,7 +29806,7 @@ POST https://DomainName/api/v1/authentication?username={username}&password={pass
 					</code>
 					<code class="method-request">
 POST authentication?username=mifos&password=password
-Content-Type: application/json 
+Content-Type: application/json
 No Request Body
 					</code>
 					<p>Example response of autentication for user that is not linked with any staff.</p>
@@ -29852,14 +29858,14 @@ No Request Body
     ]
 }
 </code>
-					
-					
-					
-					
-					
+
+
+
+
+
 					<code class="method-request">
-POST authentication?username=mifos&password=fail 
-Content-Type: application/json 
+POST authentication?username=mifos&password=fail
+Content-Type: application/json
 No Request Body
 					</code>
 					<code class="method-response">
@@ -30058,7 +30064,7 @@ POST https://DomainName/api/v1/users
 					</code>
 					<code class="method-request">
 POST users
-Content-Type: application/json 
+Content-Type: application/json
 Request body:
 {
     "username": "newuser",
@@ -30079,7 +30085,7 @@ Request body:
 					</code>
 					<code class="method-request">
 POST users
-Content-Type: application/json 
+Content-Type: application/json
 Request body:
 {
     "username": "newuser",
@@ -30117,8 +30123,8 @@ Request body:
 PUT https://DomainName/api/v1/users/{userId)
 					</code>
 					<code class="method-request">
-PUT users/3 
-Content-Type: application/json 
+PUT users/3
+Content-Type: application/json
 Request body:
 {
     "firstname": "Test",
@@ -30126,7 +30132,7 @@ Request body:
     "repeatPassword": "window75"
 }
 					</code>
-					<code class="method-response"> 
+					<code class="method-response">
 {
     "officeId": 1,
     "resourceId": 3,
@@ -30151,7 +30157,7 @@ DELETE https://DomainName/api/v1/users/{userId}
 					</code>
 					<code class="method-request">
 DELETE users/20
-Content-Type: application/json 
+Content-Type: application/json
 No Request Body
 					</code>
 					<code class="method-response">
@@ -30266,8 +30272,8 @@ GET https://DomainName/api/v1/roles/{roleId}
 POST https://DomainName/api/v1/roles
 					</code>
 					<code class="method-request">
-POST roles 
-Content-Type: application/json 
+POST roles
+Content-Type: application/json
 Request body:
 {
     "name": "Another Role Name",
@@ -30289,19 +30295,19 @@ PUT https://DomainName/api/v1/roles/{roleId}
 					</code>
 					<code class="method-request">
 PUT roles/1
-Content-Type: application/json 
-Request body: 
-{ 
-	"description": "some description(changed)" 
+Content-Type: application/json
+Request body:
+{
+	"description": "some description(changed)"
 }
 					</code>
 					<code class="method-response">
-{ 
-	"resourceId": 1, 
-	"changes": { 
-		"description": "some description(changed)" 
-	} 
-} 
+{
+	"resourceId": 1,
+	"changes": {
+		"description": "some description(changed)"
+	}
+}
 					</code>
 				</div>
 			</div>
@@ -30402,8 +30408,8 @@ No Request Body
 PUT https://DomainName/api/v1/roles/{roleId}/permissions
 					</code>
 					<code class="method-request">
-PUT roles/8 
-Content-Type: application/json 
+PUT roles/8
+Content-Type: application/json
 Request body:
 {
     "permissions": {
@@ -30498,8 +30504,8 @@ GET https://DomainName/api/v1/permissions
 PUT https://DomainName/api/v1/permissions
 						</code>
 					<code class="method-request">
-PUT permissions 
-Content-Type: application/json 
+PUT permissions
+Content-Type: application/json
 Request Body:
 {
  "permissions":{
@@ -30517,10 +30523,10 @@ Request Body:
             <div class="method-section">
                 <div class="method-description">
                     <h3>General Ledger Account</h3>
-                    <p>Ledger accounts represent an Individual account within an Organizations Chart 
-                       Of Accounts(COA) and are assigned a name and unique number by which they can 
+                    <p>Ledger accounts represent an Individual account within an Organizations Chart
+                       Of Accounts(COA) and are assigned a name and unique number by which they can
                        be identified. <br/>
-                       All transactions relating to a company's assets, liabilities, owners' equity, 
+                       All transactions relating to a company's assets, liabilities, owners' equity,
                        revenue and expenses are recorded against these accounts
                     </p>
                     <table class=matrixHeading>
@@ -30537,7 +30543,7 @@ Request Body:
                             <td>glCode</td>
                         </tr>
                         <tr>
-                            <td class=fielddesc>The ledger code associated with the 
+                            <td class=fielddesc>The ledger code associated with the
                                 Account<br>These codes are mandatory and should be unique within
                                 an organization</td>
                         </tr>
@@ -30554,17 +30560,17 @@ Request Body:
                         <tr>
                             <td class=fielddesc>Classifies the account into one of the following Types
                             	<br/><b>Asset:</b> represent the different types of economic resources
-                            	owned or controlled by business, common examples of Asset accounts are cash, 
+                            	owned or controlled by business, common examples of Asset accounts are cash,
                             	cash in bank, building, inventory, prepaid rent, goodwill, accounts receivable<br/>
 								<b>Liability:</b> represent the different types of economic obligations
 								by a business, such as accounts payable, bank loan, bonds payable<br/>
-								<b>Income:</b> represent the company's gross earnings and common examples 
+								<b>Income:</b> represent the company's gross earnings and common examples
 								include Interest Income, Sales and Service revenue<br/>
-								<b>Expense:</b> represent the company's expenditures to enable itself to 
-								operate. Common examples are electricity and water, rentals, depreciation, 
+								<b>Expense:</b> represent the company's expenditures to enable itself to
+								operate. Common examples are electricity and water, rentals, depreciation,
 								doubtful accounts, insurance.<br/>
-								<b>Equity:</b> represent the residual equity of a business (after 
-								deducting from Assets all the liabilities) including Retained Earnings 
+								<b>Equity:</b> represent the residual equity of a business (after
+								deducting from Assets all the liabilities) including Retained Earnings
 								and Appropriations <br/><br/>
 								The options are fully listed in <a href="#glaccounts_template">Retrieve
 								General Ledger Accounts Template</a>.
@@ -30574,7 +30580,7 @@ Request Body:
                             <td>usage</td>
                         </tr>
                         <tr>
-                            <td class=fielddesc>Determines how the account shall be used<br> 
+                            <td class=fielddesc>Determines how the account shall be used<br>
                             "Header" accounts specify the title of a group of accounts. They are used
                             only for grouping together detail accounts that have a similar purpose; that is, detail accounts
                             are assigned to specific header accounts
@@ -31023,7 +31029,7 @@ POST https://DomainName/api/v1/glaccounts
                     </code>
                     <code class="method-request">
 POST glaccounts
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
     "name": "Cash at Bangalore",
@@ -31054,8 +31060,8 @@ Request Body:
 PUT https://DomainName/api/v1/glaccounts/{glaccountId}
                         </code>
                     <code class="method-request">
-PUT glaccounts/22 
-Content-Type: application/json 
+PUT glaccounts/22
+Content-Type: application/json
 Request Body:
 {
     "name": "Cash at Bangalore rural"
@@ -31072,8 +31078,8 @@ Request Body:
                 </div>
                 <div class="method-example">
                     <code class="method-request">
-PUT glaccounts/1 
-Content-Type: application/json 
+PUT glaccounts/1
+Content-Type: application/json
 Request Body:
 {
     "disabled": true
@@ -31105,7 +31111,7 @@ DELETE https://DomainName/api/v1/glaccounts/{glaccountId}
                     </code>
                     <code class="method-request">
 DELETE glaccounts/1
-Content-Type: application/json 
+Content-Type: application/json
 No Request Body:
                     </code>
                     <code class="method-response">
@@ -31122,7 +31128,7 @@ No Request Body:
                 <div class="method-description">
                     <h3>Accounting Closure</h3>
                     <p>An accounting closure indicates that no more journal
-                    	entries may be logged (or reversed) in the system, 
+                    	entries may be logged (or reversed) in the system,
                     	either manually or via the portfolio with an entry date
                     	prior to the defined closure date
                     </p>
@@ -31293,7 +31299,7 @@ POST https://DomainName/api/v1/glclosures
                     </code>
                     <code class="method-request">
 POST glclosures
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
     "officeId": 1,
@@ -31324,8 +31330,8 @@ Request Body:
 PUT https://DomainName/api/v1/glclosures/{glclosureId}
                         </code>
                     <code class="method-request">
-PUT glclosures/1 
-Content-Type: application/json 
+PUT glclosures/1
+Content-Type: application/json
 Request Body:
 {
     "comments": "All transactions verified by Johnny Cash"
@@ -31358,7 +31364,7 @@ DELETE https://DomainName/api/v1/glclosures/{glclosureId}
                     </code>
                     <code class="method-request">
 DELETE glclosures/1
-Content-Type: application/json 
+Content-Type: application/json
 No Request Body:
                     </code>
                     <code class="method-response">
@@ -31374,7 +31380,7 @@ No Request Body:
             <div class="method-section">
                 <div class="method-description">
                     <h3>Journal Entries</h3>
-                    <p>A journal entry refers to the logging of 
+                    <p>A journal entry refers to the logging of
                     transactions against general ledger accounts. A journal
                     entry may consist of several line items, each of which is either a "debit" or a "credit". The total amount of the
                     debits must equal the total amount of the credits or the
@@ -31420,7 +31426,7 @@ No Request Body:
                             <td>amount</td>
                         </tr>
                         <tr>
-                            <td class=fielddesc>The Monetary amount associated 
+                            <td class=fielddesc>The Monetary amount associated
                             with this entry
                             </td>
                         </tr>
@@ -31441,8 +31447,8 @@ No Request Body:
                             <td>transactionId</td>
                         </tr>
                         <tr>
-                            <td class=fielddesc>A unique Identifier for a set 
-                            	of related Credit and Debit entries that make up 
+                            <td class=fielddesc>A unique Identifier for a set
+                            	of related Credit and Debit entries that make up
                             	a "balanced" jounral Entry. For a manual entry,
                             	this feild is a unique string.<br/>
                             	For a system generated entry, the combination
@@ -31453,11 +31459,11 @@ No Request Body:
                             <td>manualEntry</td>
                         </tr>
                         <tr>
-                            <td class=fielddesc>Flag determines if an entry is 
-                            generated by the portfolio (posted automatically by 
+                            <td class=fielddesc>Flag determines if an entry is
+                            generated by the portfolio (posted automatically by
                             the system  during the lifecycle of loan or saving
                             products) or manually created by using the <a href="
-                            journalentries_create">Create (Balanced) Journal 
+                            journalentries_create">Create (Balanced) Journal
                             Entries</a> API
                         	</td>
                         </tr>
@@ -31467,7 +31473,7 @@ No Request Body:
                         <tr>
                             <td class=fielddesc>Flag determines if this manual
                             journal entry has been reversed using the <a href="
-                            journalentries_reverse">Reverse a Journal Entry</a> 
+                            journalentries_reverse">Reverse a Journal Entry</a>
                             API. <br/>
                             Note: A journal entry is reversed by logging debits
                             for all credits that make up the Journal entry and
@@ -31547,7 +31553,7 @@ No Request Body:
 							Integer <span>optional</span>, defaults to 0
 						</dd>
 						<dd>Indicates from what result to start from.</dd>
-						
+
 						<dt>limit</dt>
 						<dd>
 							Integer <span>optional</span>, defaults to 200
@@ -31568,10 +31574,10 @@ No Request Body:
 
 						<dt>officeId</dt>
 						<dd>
-							Integer <span>optional</span> 
+							Integer <span>optional</span>
 						</dd>
 						<dd>Provides ability to restrict list of centers returned based on the office there associated with.</dd>
-						
+
 						<dt>glAccountId</dt>
                         <dd>
                             Integer <span>optional</span>
@@ -31581,9 +31587,9 @@ No Request Body:
                             Boolean <span>optional</span>
                         </dd>
                         <dd>Flag determines if only manually created journal entries
-                        	are to be returned( journal entries created by 
-                        	the system during lifecycle of loan or saving 
-                        	products etc shall be excluded) 
+                        	are to be returned( journal entries created by
+                        	the system during lifecycle of loan or saving
+                        	products etc shall be excluded)
                         	<br/>
                         	Set to "false" by default if not passed in explicity
                         </dd>
@@ -31591,14 +31597,14 @@ No Request Body:
                         <dd>
                             Date<span>optional</span>
                         </dd>
-                        <dd>Filters for Journal entries whose entry Date 
+                        <dd>Filters for Journal entries whose entry Date
                         	is greater than or equal to the passed in Date
                         </dd>
                         <dt>toDate</dt>
                         <dd>
                             Date <span>optional</span>
                         </dd>
-                        <dd>Filters for Journal entries whose entry Date 
+                        <dd>Filters for Journal entries whose entry Date
                         	is lesser than or equal to the passed in Date
                         </dd>
                         <dt>transactionId</dt>
@@ -31609,16 +31615,16 @@ No Request Body:
                         <dd>
                             Boolean <span>optional</span>
                         </dd>
-                        <dd>Flag determines if additional transactional details 
+                        <dd>Flag determines if additional transactional details
                         	to be returned(like payment details and notes).
                         </dd>
                         <dt>runningBalance</dt>
                         <dd>
                             Boolean <span>optional</span>
                         </dd>
-                        <dd>Flag determines whether running balances 
-                        	to be returned 
-                        </dd>				
+                        <dd>Flag determines whether running balances
+                        	to be returned
+                        </dd>
 					</dl>
 					<p>Example Requests:</p>
 					<div class=apiClick>journalentries</div>
@@ -31750,7 +31756,7 @@ GET https://DomainName/api/v1/journalentries?transactionId=PB37X8Y21EQUY4S
                             <td><div class="mifosXHeading2">Mandatory Fields</div></td>
                         </tr>
                         <tr class=alt>
-                            <td>officeId, transactionDate 
+                            <td>officeId, transactionDate
                             </td>
                         </tr>
                         <tr>
@@ -31764,7 +31770,7 @@ GET https://DomainName/api/v1/journalentries?transactionId=PB37X8Y21EQUY4S
                             	in the journal entry. Each credit entry contains
                             	the following items <br/>
                             	glAccountId: Identifier of the general ledger
-                            	account against which the credit entry shall be 
+                            	account against which the credit entry shall be
                             	made <br/>
                             	amount: Amount of money credited
                             	<br/>
@@ -31778,9 +31784,9 @@ GET https://DomainName/api/v1/journalentries?transactionId=PB37X8Y21EQUY4S
                         </tr>
                         <tr>
                             <td class=fielddesc>Details of the debits contained
-                            	in the journal entry. Each debit entry contains the 
+                            	in the journal entry. Each debit entry contains the
                             	following items <br/>
-                            	glAccountId: Identifier of the general ledger account 
+                            	glAccountId: Identifier of the general ledger account
                             	against which the debit entry shall be
                             	made <br/>
                             	amount: Amount of money debited
@@ -31807,7 +31813,7 @@ POST https://DomainName/api/v1/journalentries
                     </code>
                     <code class="method-request">
 POST journalentries
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 "officeId": 1,
@@ -31845,7 +31851,7 @@ POST https://DomainName/api/v1/journalentries
                     </code>
                     <code class="method-request">
 POST journalentries
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 	"locale": "en",
@@ -31870,7 +31876,7 @@ POST https://DomainName/api/v1/journalentries
                     </code>
                     <code class="method-request">
 POST journalentries
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 	"locale": "en",
@@ -31903,7 +31909,7 @@ POST https://DomainName/api/v1/journalentries
                     </code>
                     <code class="method-request">
 POST journalentries
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 	"locale": "en",
@@ -31943,7 +31949,7 @@ Request Body:
                             <td><div class="mifosXHeading2">Mandatory Fields</div></td>
                         </tr>
                         <tr class=alt>
-                            <td>officeId 
+                            <td>officeId
                             </td>
                         </tr>
                     </table>
@@ -31954,7 +31960,7 @@ POST https://DomainName/api/v1/journalentries?command=updateRunningBalance
                     </code>
                     <code class="method-request">
 POST journalentries?command=updateRunningBalance
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 "officeId": 1,
@@ -31965,11 +31971,11 @@ Request Body:
     "officeId": 1,
 }
                     </code>
-                   
+
                 </div>
             </div>
 
-			
+
             <a id="journalentries_retrieve" name="journalentries_retrieve"
                 class="old-syle-anchor">&nbsp;</a>
             <div class="method-section">
@@ -32038,7 +32044,7 @@ GET https://DomainName/api/v1/journalentries/{entryId}
                         <b>Note:</b> A journal entry is reversed by logging debits
                         for all credits that constitute the Journal entry and
                         vice-versa. The transactionId of the "reversal Entry" is returned
-                        as the methods response 
+                        as the methods response
                     </p>
                     <h5>Arguments</h5>
 					<dl class="argument-list">
@@ -32064,7 +32070,7 @@ GET https://DomainName/api/v1/journalentries/{transactionId}?command=reverse
                     </code>
                     <code class="method-request">
 POST journalentries/C1MAE935K0IAEYA?command=reverse
-Content-Type: application/json 
+Content-Type: application/json
 </code>
                     <code class="method-response">
 {
@@ -32073,7 +32079,7 @@ Content-Type: application/json
                     </code>
                 </div>
             </div>
-			
+
 <!-- start office gl accout mappings-->
 
 <a id="officeglaccount" name="officeglaccount" class="old-syle-anchor">&nbsp;</a>
@@ -32160,13 +32166,13 @@ GET https://DomainName/api/v1/financialactivityaccounts
                             <td><div class="mifosXHeading2">Mandatory Fields</div></td>
                         </tr>
                         <tr class=alt>
-                            <td>financialActivityId, glAccountId 
+                            <td>financialActivityId, glAccountId
                             </td>
                         </tr>
-                       
+
                     </table>
                     <br />
-					
+
                 </div>
                 <div class="method-example">
                     <code class="method-declaration">
@@ -32174,7 +32180,7 @@ POST https://DomainName/api/v1/financialactivityaccounts
                     </code>
                     <code class="method-request">
 POST financialactivityaccounts
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 "financialActivityId": 200,
@@ -32197,7 +32203,7 @@ Request Body:
                         the API updates the Ledger account linked to a Financial Activity
                         <br>
                     </p>
-                   
+
                 </div>
                 <div class="method-example">
                     <code class="method-declaration">
@@ -32205,7 +32211,7 @@ PUT https://DomainName/api/v1/financialactivityaccounts/{financialactivityaccoun
                     </code>
                     <code class="method-request">
 PUT financialactivityaccounts
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 "financialActivityId": 200,
@@ -32220,11 +32226,11 @@ Request Body:
   }
 }
                     </code>
-                   
+
                 </div>
             </div>
 
-			
+
             <a id="financialactivityaccounts_retrieve" name="financialactivityaccounts_retrieve"
                 class="old-syle-anchor">&nbsp;</a>
             <div class="method-section">
@@ -32268,7 +32274,7 @@ DELETE https://DomainName/api/v1/financialactivityaccounts/{financialactivityacc
                     </code>
                     <code class="method-request">
 DELETE financialactivityaccounts/1?
-Content-Type: application/json 
+Content-Type: application/json
 </code>
                     <code class="method-response">
 {
@@ -32280,7 +32286,7 @@ Content-Type: application/json
 
 
 			<!-- start Periodic accrual API doc-->
-			
+
 			<a id="periodicaccrualaccounting" name="periodicaccrualaccounting" class="old-syle-anchor">&nbsp;</a>
             <div class="method-section">
                 <div class="method-description">
@@ -32296,16 +32302,16 @@ Content-Type: application/json
                             <td>tillDate</td>
                         </tr>
                         <tr>
-                            <td class=fielddesc>which specifies periodic accruals should happen till the given Date 
+                            <td class=fielddesc>which specifies periodic accruals should happen till the given Date
                             	</td>
                         </tr>
-                        
+
                     </table>
                 </div>
             </div>
 
 
-			
+
 		<a id="periodicaccrualaccounting_run" name="periodicaccrualaccounting_run" class="old-syle-anchor">&nbsp;</a>
             <div class="method-section">
                 <div class="method-description">
@@ -32315,13 +32321,13 @@ Content-Type: application/json
                             <td><div class="mifosXHeading2">Mandatory Fields</div></td>
                         </tr>
                         <tr class=alt>
-                            <td>tillDate 
+                            <td>tillDate
                             </td>
                         </tr>
-                       
+
                     </table>
                     <br />
-					
+
                 </div>
                 <div class="method-example">
                     <code class="method-declaration">
@@ -32329,12 +32335,12 @@ POST https://DomainName/api/v1/runaccruals
                     </code>
                     <code class="method-request">
 POST financialactivityaccounts
-Content-Type: application/json 
+Content-Type: application/json
 Request Body:
 {
 	"locale": "en",
 	"dateFormat": "dd MMMM yyyy",
-	"tillDate":"04 June 2014" 
+	"tillDate":"04 June 2014"
 }
                     </code>
                     <code class="method-response">
@@ -32343,7 +32349,7 @@ Request Body:
             </div>
 
 			<!-- end Periodic accrual API doc-->
-			
+
 			<!-- start of Search API doc -->
 		<a id="search" name="search" class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
@@ -32359,7 +32365,7 @@ Request Body:
 						<tr class=alt>
 							<td rowspan="3"><a href="#clients">Client</a></td>
 							<td>Display Name</td>
-						</td>	
+						</td>
 						<tr class=alt>
 							<td>Account Number</td>
 						</tr>
@@ -32613,8 +32619,8 @@ GET https://DomainName/api/v1/search?query=000000111
 						</tr>
 						<tr class=alt>
 							<td>
-								loanStatus, loanProducts, offices, loanDateOption, loanFromDate, loanToDate, <br>includeOutStandingAmountPercentage, outStandingAmountPercentageCondition, <br> 
-								minOutStandingAmountPercentage and maxOutStandingAmountPercentage OR outStandingAmountPercentage, <br>includeOutstandingAmount, outstandingAmountCondition, <br> 
+								loanStatus, loanProducts, offices, loanDateOption, loanFromDate, loanToDate, <br>includeOutStandingAmountPercentage, outStandingAmountPercentageCondition, <br>
+								minOutStandingAmountPercentage and maxOutStandingAmountPercentage OR outStandingAmountPercentage, <br>includeOutstandingAmount, outstandingAmountCondition, <br>
 								minOutstandingAmount and maxOutstandingAmount OR outstandingAmount</td>
 						</tr>
 					</table>
@@ -32643,7 +32649,7 @@ Content-Type: application/json Request Body:
 	"outstandingAmountCondition": "between",
 	"minOutstandingAmount": "100",
 	"maxOutstandingAmount": "10000"
-} 
+}
 					</code>
 					<code class="method-response">
 [{
@@ -32671,14 +32677,14 @@ Content-Type: application/json Request Body:
 				</div>
 			</div>
 		<!-- ends Search API docs-->
-		
+
 		<!-- start of interest rate chart API docs -->
 		<a id="interestratechart" name="interestratechart" class="old-syle-anchor">&nbsp;</a>
 		<div class="method-section">
 			<div class="method-description">
 				<h3>Interest Rate Chart</h3>
 				<p>This defines an interest rate scheme that can be associated to a term deposit product. This will have a slab (band or range) of deposit periods and the associated interest rates applicable along with incentives for each band.</p>
-				
+
 				<table class=matrixHeading>
 					<tr class="matrixHeadingBG">
 						<td><div class="mifosXHeading2">Field Descriptions</div></td>
@@ -32687,7 +32693,7 @@ Content-Type: application/json Request Body:
 						<td>name</td>
 					</tr>
 					<tr>
-						<td class=fielddesc>Name of the interest rate chart.  
+						<td class=fielddesc>Name of the interest rate chart.
 						</td>
 					</tr>
 					<tr class=alt>
@@ -32740,7 +32746,7 @@ Content-Type: application/json Request Body:
 							<td>name, description and endDate</td>
 						</tr>
 					</table>
-					
+
 				</div>
 				<div class="method-example">
 					<code class="method-declaration">
@@ -32748,8 +32754,8 @@ POST https://DomainName/api/v1/interestratecharts
 					</code>
 					<code class="method-request">
 POST interestratecharts
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
   "name": "Chart - 2014",
   "description": "This chart is applicable for year 2014",
@@ -32887,8 +32893,8 @@ PUT https://DomainName/api/v1/interestratecharts/{chartId}
 					</code>
 					<code class="method-request">
 PUT interestratecharts/1
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
   "name": "Interest rate chart for 2014",
   "description": "Interest rate chart for 2014",
@@ -32914,7 +32920,7 @@ DELETE https://DomainName/api/v1/interestratecharts/{chartId}
 					</code>
 					<code class="method-request">
 DELETE interestratecharts/1
-Content-Type: application/json 
+Content-Type: application/json
 No Request Body:
 					</code>
 					<code class="method-response">
@@ -32930,7 +32936,7 @@ No Request Body:
 				<div class="method-description">
 					<h4>Retrieve Chart Details Template</h4>
 					<p>This is a convenience resource. It can be useful when
-						building maintenance user interface screens for creating a chart. 
+						building maintenance user interface screens for creating a chart.
 						The template data returned consists of any or all
 						of:
 					<ul>
@@ -32938,7 +32944,7 @@ No Request Body:
 						<li class=normalli>Allowed Value Lists</li>
 					</ul>
 					</p>
-					
+
 					<p>Example Request:</p>
 					<div class=apiClick>interestratecharts/template</div>
 				</div>
@@ -32983,7 +32989,7 @@ GET https://DomainName/api/v1/interestratecharts/template
 			<div class="method-description">
 				<h3>Interest Rate Slab (A.K.A interest bands)</h3>
 				<p>The slabs a.k.a interest bands are associated with Interest Rate Chart. These bands allow to define different interest rates for different deposit term periods.</p>
-				
+
 				<table class=matrixHeading>
 					<tr class="matrixHeadingBG">
 						<td><div class="mifosXHeading2">Field Descriptions</div></td>
@@ -32992,15 +32998,15 @@ GET https://DomainName/api/v1/interestratecharts/template
 						<td>periodType</td>
 					</tr>
 					<tr>
-						<td class=fielddesc>The period type is used to define the different deposit term intervals. 0=Daily, 1=Weekly, 2=Monthly, 3=Yearly 
+						<td class=fielddesc>The period type is used to define the different deposit term intervals. 0=Daily, 1=Weekly, 2=Monthly, 3=Yearly
 						</td>
 					</tr>
 					<tr class=alt>
 						<td>fromPeriod</td>
 					</tr>
 					<tr>
-						<td class=fielddesc>Start of the period for defining deposit term interval. 
-							<br> e.g. for 1 day to 180 days applicable interest rate is 5% 
+						<td class=fielddesc>Start of the period for defining deposit term interval.
+							<br> e.g. for 1 day to 180 days applicable interest rate is 5%
 							<br> then startPeriod=1, endPeriod=180 and periodType=0
 						</td>
 					</tr>
@@ -33008,7 +33014,7 @@ GET https://DomainName/api/v1/interestratecharts/template
 						<td>toPeriod</td>
 					</tr>
 					<tr>
-						<td class=fielddesc>End of the period for defining deposit term interval. 
+						<td class=fielddesc>End of the period for defining deposit term interval.
 							<br> e.g. for 1 day to 180 days applicable interest rate is 5%
 						</td>
 					</tr>
@@ -33070,8 +33076,8 @@ POST https://DomainName/api/v1/interestratecharts/{chartId}/chartslabs
 					</code>
 					<code class="method-request">
 POST interestratecharts/{chartId}/chartslabs
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
   "periodType": "0",
   "fromPeriod": "1",
@@ -33103,7 +33109,7 @@ Request Body:
 				<div class="method-description">
 					<h4>Retrieve all Slabs</h4>
 					<p>Retrieve list of slabs associated with a chart </p>
-					
+
 					<p>Example Requests:</p>
 					<div class=apiClick>interestratecharts/1/chartslabs</div>
 					<br>
@@ -33134,10 +33140,10 @@ GET https://DomainName/api/v1/interestratecharts/{chartId}/chartslabs
       "displayLabel": "US Dollar ($)"
     },
 	"incentives":[{
-	 "id":1, 
-	 "entityType":{"id":2,"code":"InterestIncentiveEntityType.customer","value":"Customer"}, 
+	 "id":1,
+	 "entityType":{"id":2,"code":"InterestIncentiveEntityType.customer","value":"Customer"},
 	 "attributeName":{"id":2,"code":"InterestIncentiveAttributeName.gender","value":"Gender"}, "conditionType":{"id":2,"code":"incentiveConditionType.equal","value":"equal"},
-	 "attributeValue":"11","attributeValueDesc":"FEMALE", 
+	 "attributeValue":"11","attributeValueDesc":"FEMALE",
 	 "incentiveType":{"id":3,"code":"InterestIncentiveType.incentive","value":"Incentive"},
 	 "amount":-1.000000
 	 }]
@@ -33182,10 +33188,10 @@ GET https://DomainName/api/v1/interestratecharts/{chartId}/chartslabs/{slabId}
     "displayLabel": "US Dollar ($)"
   },
   "incentives":[{
-	 "id":1, 
-	 "entityType":{"id":2,"code":"InterestIncentiveEntityType.customer","value":"Customer"}, 
+	 "id":1,
+	 "entityType":{"id":2,"code":"InterestIncentiveEntityType.customer","value":"Customer"},
 	 "attributeName":{"id":2,"code":"InterestIncentiveAttributeName.gender","value":"Gender"}, "conditionType":{"id":2,"code":"incentiveConditionType.equal","value":"equal"},
-	 "attributeValue":"11","attributeValueDesc":"FEMALE", 
+	 "attributeValue":"11","attributeValueDesc":"FEMALE",
 	 "incentiveType":{"id":3,"code":"InterestIncentiveType.incentive","value":"Incentive"},
 	 "amount":-1.000000
 	 }]
@@ -33206,8 +33212,8 @@ PUT https://DomainName/api/v1/interestratecharts/{chartId}/chartslabs/{slabId}
 					</code>
 					<code class="method-request">
 PUT interestratecharts/1/chartslabs/1
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
   "annualInterestRate": "6",
   "description": "Interest rate changed to 6%",
@@ -33238,7 +33244,7 @@ DELETE https://DomainName/api/v1/interestratecharts/{chartId}/chartslabs/{slabId
 					</code>
 					<code class="method-request">
 DELETE interestratecharts/1/chartslabs/1
-Content-Type: application/json 
+Content-Type: application/json
 No Request Body:
 					</code>
 					<code class="method-response">
@@ -33250,7 +33256,7 @@ No Request Body:
 			</div>
 
 		<!-- end of interest rate slabs API docs-->
-		
+
 		<!-- start of clients api docs -->
 		<a id="templates" name="clients" class="old-syle-anchor">&nbsp;</a>
 		<div class="method-section">
@@ -33260,7 +33266,7 @@ No Request Body:
 
 				<p>User Generated Documents (and other types of templates) can aggregate data from several Mifos X back-end API calls via <b>mappers</b>.  Mappers can even access non-Mifos X REST services from other servers.  UGDs can render such data in tables, show images, etc. <i>TBD: Please have a look at some of the Example UGDs included in Mifos X (or <a href="https://mifosforge.jira.com/wiki/display/RES/UGD_FinalDoc">the Wiki page</a>, for now.).</i></p>
 
-				<p>UGDs can be assigned to an entity like <b>client</b> or <b>loan</b> and be of a typ like <b>document</b>.  The entity and type of a UGD is only there for the convenience of user agents (UIs), in order to know where to show UGDs for the user (i.e. which tab).  The Template Engine back-end runner does not actually need this metadata.</p>
+				<p>UGDs can be assigned to an entity like <b>client</b> or <b>loan</b> and be of a type like <b>Document</b> or <b>SMS</b>.  The entity and type of a UGD is only there for the convenience of user agents (UIs), in order to know where to show UGDs for the user (i.e. which tab).  The Template Engine back-end runner does not actually need this metadata.</p>
 				<table class=matrixHeading>
 					<tr class="matrixHeadingBG">
 						<td><div class="mifosXHeading2">Field Descriptions</div></td>
@@ -33269,7 +33275,7 @@ No Request Body:
 						<td>name</td>
 					</tr>
 					<tr>
-						<td class=fielddesc>Describes the document which will be created. 
+						<td class=fielddesc>Describes the document which will be created.
 							It must be unique and appears listed in a tab at the assigned entity. </td>
 					</tr>
 					<tr class=alt>
@@ -33277,8 +33283,8 @@ No Request Body:
 					</tr>
 					<tr>
 						<td class=fielddesc>
-							For now only the type document is supported.
-							In a next version UGDs may be created for e-mails oder SMS.
+							For now only the types Document and SMS are supported.
+							In a next version, UGDs may be created for e-mails as well.
 						</td>
 					</tr>
 					<tr class=alt>
@@ -33306,15 +33312,15 @@ No Request Body:
 							By default one mapper is assigned to the UGD depending on the entity.
 							Mappers are used to create requests and get tags wich may be used in the UGD.
 							Also mappery are in order and may depend on the previous mappers.
-							For now mappers expect a response in JSON or plain/text. 
-							JSON contains the keys and the values. 
+							For now mappers expect a response in JSON or plain/text.
+							JSON contains the keys and the values.
 							If the response is plain/text it can be accessed by {{$mapperskey.src}}
 						</td>
 					</tr>
 				</table>
 			</div>
 		</div>
-		
+
 			<a id="clients_template" name="clients_template" class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
 				<div class="method-description">
@@ -33357,22 +33363,22 @@ GET https://DomainName/api/v1/templates/template
 {
   "id": 1,
   "name": "Test",
-  "entity": "loan",
-  "type": "Document",
+  "entity": 1,
+  "type": 0,
   "text": "This is a loan for {{loan.clientName}}",
   "mappers": [
     {
-    "mapperorder": 0,
-    "mapperkey": "loan",
-    "mappervalue": "loans/{{loanId}}?associations=all&tenantIdentifier={{tenantIdentifier}}",
-    "id": 1  
+    "mappersorder": 0,
+    "mapperskey": "loan",
+    "mappersvalue": "loans/{{loanId}}?associations=all&tenantIdentifier={{tenantIdentifier}}",
+    "id": 1
     }
   ]
 }
 					</code>
 				</div>
 			</div>
-			
+
 			<a id="resources_addtemplate" name="resources_addtemplate"
 				class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
@@ -33396,20 +33402,20 @@ POST https://DomainName/api/v1/templates
 					</code>
 					<code class="method-request">
 POST templates
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
   "id": 1,
   "name": "Test",
-  "entity": "loan",
-  "type": "Document",
+  "entity": 1,
+  "type": 0,
   "text": "This is a loan for {{loan.clientName}}",
   "mappers": [
     {
-      "mapperorder": 0,
-      "mapperkey": "loan",
-      "mappervalue": "loans/{{loanId}}?associations=all&tenantIdentifier={{tenantIdentifier}}",
-      "id": 1  
+      "mappersorder": 0,
+      "mapperskey": "loan",
+      "mappersvalue": "loans/{{loanId}}?associations=all&tenantIdentifier={{tenantIdentifier}}",
+      "id": 1
     }
   ]
 }
@@ -33421,7 +33427,7 @@ Request Body:
 					</code>
 				</div>
 			</div>
-			
+
 			<a id="resource_templatelist" name="resource_templatelist"
 				class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
@@ -33433,7 +33439,7 @@ Request Body:
 					<br>
 					<p>
 					It is also possible to get specific UGDs by entity and type:
-					</p> 
+					</p>
 					<div class=apiClick>templates?type=0&entity=0</div>
 					<br>
 					<table class=matrixHeading>
@@ -33458,7 +33464,7 @@ Request Body:
 						<tr>
 							<td></td>
 							<td></td>
-							<td>SMS (not yet)</td>
+							<td>SMS</td>
 							<td>2</td>
 						</tr>
 					</table>
@@ -33472,15 +33478,15 @@ GET https://DomainName/api/v1/templates
   {
     "id": 1,
     "name": "Test",
-    "entity": "loan",
-    "type": "Document",
+    "entity": 1,
+    "type": 0,
     "text": "This is a loan for {{loan.clientName}}",
     "mappers": [
       {
-        "mapperorder": 0,
-        "mapperkey": "loan",
-        "mappervalue": "loans/{{loanId}}?associations=all&tenantIdentifier={{tenantIdentifier}}",
-        "id": 1  
+        "mappersorder": 0,
+        "mapperskey": "loan",
+        "mappersvalue": "loans/{{loanId}}?associations=all&tenantIdentifier={{tenantIdentifier}}",
+        "id": 1
       }
     ]
   }
@@ -33488,7 +33494,7 @@ GET https://DomainName/api/v1/templates
 					</code>
 				</div>
 			</div>
-			
+
 			<a id="resources_retrievetemplate" name="resources_retrievetemplate"
 				class="old-syle-anchor">&nbsp;</a>
 			<div class="method-section">
@@ -33505,14 +33511,14 @@ GET https://DomainName/api/v1/templates/{Id}
 {
   "id": 1,
   "name": "Test",
-  "entity": "loan",
-  "type": "Document",
+  "entity": 1,
+  "type": 0,
   "text": "This is a loan for {{loan.clientName}}",
   "mappers": [
     {
-      "mapperorder": 0,
-      "mapperkey": "loan",
-      "mappervalue": "loans/{{loanId}}?associations=all&tenantIdentifier={{tenantIdentifier}}",
+      "mappersorder": 0,
+      "mapperskey": "loan",
+      "mappersvalue": "loans/{{loanId}}?associations=all&tenantIdentifier={{tenantIdentifier}}",
       "id": 1
     }
   ]
@@ -33533,19 +33539,19 @@ PUT https://DomainName/api/v1/templates/{templateId}
 					</code>
 					<code class="method-request">
 PUT templates/1
-Content-Type: application/json 
-Request Body: 
+Content-Type: application/json
+Request Body:
 {
   "id": 1,
   "name": "Test",
-  "entity": "loan",
-  "type": "Document",
+  "entity": 1,
+  "type": 0,
   "text": "This is a loan for {{loan.clientName}}",
   "mappers": [
     {
-      "mapperorder": 0,
-      "mapperkey": "loan",
-      "mappervalue": "loans/{{loanId}}?associations=all&tenantIdentifier={{tenantIdentifier}}",
+      "mappersorder": 0,
+      "mapperskey": "loan",
+      "mappersvalue": "loans/{{loanId}}?associations=all&tenantIdentifier={{tenantIdentifier}}",
       "id": 1
     }
   ]
@@ -33571,7 +33577,7 @@ DELETE https://DomainName/api/v1/templates/{templateId}
 					</code>
 					<code class="method-request">
 DELETE templates/1
-Content-Type: application/json 
+Content-Type: application/json
 No Request Body:
 					</code>
 					<code class="method-response">
@@ -33581,16 +33587,16 @@ No Request Body:
 					</code>
 				</div>
 			</div>
-			
+
 			<!-- end of UGD api docs -->
-		
-		
-		
-		
-		
-		
-		
-		
+
+
+
+
+
+
+
+
         </div>
 		<!-- main-content-wrapper -->
 
@@ -34619,8 +34625,8 @@ No Request Body:
 					<td></td>
 					<td>{entityType}/{entityId}/documents/{documentId}/attachment</td>
 					<td></td>
-					<td><a href="#documents_retrieve_file">Retrieve 
-						binary file associated with a 
+					<td><a href="#documents_retrieve_file">Retrieve
+						binary file associated with a
 						Document</a>
 					</td>
 					<td></td>
@@ -34948,7 +34954,7 @@ No Request Body:
 					<td></td>
 					<td></td>
 					<td></td>
-				</tr>			
+				</tr>
 				<tr>
 					<td></td>
 					<td>savingsaccounts/{accountId}?command=assignSavingsOfficer</td>
@@ -35100,7 +35106,7 @@ No Request Body:
 					<td></td>
 					<td></td>
 					<td></td>
-				</tr>				
+				</tr>
 				<tr>
 					<td><a href="#fdproducts">Fixed Deposit Product</a></td>
 					<td>fixeddepositproducts</td>
@@ -35324,7 +35330,7 @@ No Request Body:
 					<td></td>
 					<td></td>
 					<td></td>
-				</tr>							
+				</tr>
 				<tr>
 					<td><a href="#recurringdepositaccounts_transactions">Recurring Deposit Transactions</a></td>
 					<td>recurringdepositaccounts/{accountId}/transactions?command=deposit</td>
@@ -35437,12 +35443,12 @@ No Request Body:
 			</table>
 		</div>
 
-<a 	id="paymentapplicationlogic" 
-	name="paymentapplicationlogic" 
+<a 	id="paymentapplicationlogic"
+	name="paymentapplicationlogic"
 	class="old-syle-anchor">&nbsp;</a>
 <div class="fullMatrixOuter">
 	<h3>Payment Application Logic / Transaction Processing Strategy</h3>
-	
+
 <p>The way payments (transactions) are handled and the effect they have on the loan is an area that can differ widely from MFI to MFI. Mifos allows for <strong>transaction processing strategies</strong> to be developed that are associated with a loan product. Several approaches are provided out-of-the-box. If these approaches dont meet exactly your needs a custom approach can be developed and released with the platform.</p>
 
 <p>In general the the following areas are handled by any given <strong>transaction processing strategy</strong>:
@@ -35487,7 +35493,7 @@ No Request Body:
 	<p><strong>On time payment</strong>: Any payment that pays off an installment that occurs exactly on the due date of the installment.</p>
 
 	<p><strong>Late payment</strong>: Any payment that pays off an installment that occurs after the due date of the installment. There is no penalization for late payment. The total cost of the loan does not automatically increase, no penalties are automatically applied to the loan.</p>
-	
+
 	<h4>Interest Principal Penalties Fees Order</h4>
 	<p>The key aspect of this strategy is the payment order.</p>
 	<p>
@@ -35542,8 +35548,8 @@ No Request Body:
 	<p><strong>Late payment</strong>: Any payment that pays off an installment that occurs after the due date of the installment. There is no penalization for late payment. The total cost of the loan does not automatically increase, no penalties are automatically applied to the loan.</p>
 
 
-      
-      
+
+
 </div>
 
 	<!-- end of page-wrapper div -->
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/api/HookApiConstants.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/api/HookApiConstants.java
index 6350d71f8..d19f62a90 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/api/HookApiConstants.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/api/HookApiConstants.java
@@ -11,46 +11,52 @@ import java.util.Set;
 
 public class HookApiConstants {
 
-	public static final String HOOK_RESOURCE_NAME = "HOOK";
+    public static final String HOOK_RESOURCE_NAME = "HOOK";
 
-	public static final String nameParamName = "name";
+    public static final String nameParamName = "name";
 
-	public static final String displayNameParamName = "displayName";
+    public static final String displayNameParamName = "displayName";
 
-	public static final String isActiveParamName = "isActive";
+    public static final String isActiveParamName = "isActive";
 
-	public static final String webTemplateName = "Web";
+    public static final String webTemplateName = "Web";
 
-	public static final String smsTemplateName = "SMS Bridge";
+    public static final String smsTemplateName = "SMS Bridge";
 
-	public static final String payloadURLName = "Payload URL";
+    public static final String payloadURLName = "Payload URL";
 
-	public static final String contentTypeName = "Content Type";
+    public static final String contentTypeName = "Content Type";
 
-	public static final String smsProviderName = "SMS Provider";
+    public static final String smsProviderName = "SMS Provider";
 
-	public static final String smsProviderAccountIdName = "SMS Provider Account Id";
+    public static final String smsProviderAccountIdName = "SMS Provider Account Id";
 
-	public static final String smsProviderTokenIdName = "SMS Provider Token";
+    public static final String smsProviderTokenIdName = "SMS Provider Token";
 
-	public static final String phoneNumberName = "Phone Number";
-	
-	public static final String apiKeyName = "Api Key";
+    public static final String phoneNumberName = "Phone Number";
 
-	public static final String configParamName = "config";
+    public static final String apiKeyName = "Api Key";
 
-	public static final String eventsParamName = "events";
+    public static final String configParamName = "config";
 
-	public static final String entityNameParamName = "entityName";
+    public static final String eventsParamName = "events";
 
-	public static final String actionNameParamName = "actionName";
+    public static final String entityNameParamName = "entityName";
 
-	public static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(
-			Arrays.asList(nameParamName, displayNameParamName,
-					isActiveParamName, configParamName, eventsParamName));
+    public static final String actionNameParamName = "actionName";
 
-	public static final Set<String> UPDATE_REQUEST_DATA_PARAMETERS = new HashSet<>(
-			Arrays.asList(nameParamName, displayNameParamName,
-					isActiveParamName, configParamName, eventsParamName));
+    public static final String templateIdParamName = "templateId";
+
+    public static final String templateNameParamName = "templateName";
+
+    public static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(
+            Arrays.asList(nameParamName, displayNameParamName,
+                    templateIdParamName, isActiveParamName, configParamName,
+                    eventsParamName, templateNameParamName));
+
+    public static final Set<String> UPDATE_REQUEST_DATA_PARAMETERS = new HashSet<>(
+            Arrays.asList(nameParamName, displayNameParamName,
+                    templateIdParamName, isActiveParamName, configParamName,
+                    eventsParamName, templateNameParamName));
 
 }
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/data/HookData.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/data/HookData.java
index d13e544b1..d49a16199 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/data/HookData.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/data/HookData.java
@@ -5,87 +5,95 @@
  */
 package org.mifosplatform.infrastructure.hooks.data;
 
+import org.joda.time.LocalDate;
+
 import java.io.Serializable;
 import java.util.List;
 
-import org.joda.time.LocalDate;
-
 public class HookData implements Serializable {
 
-	private final Long id;
-	private final String name;
-	private final String displayName;
-	private final Boolean isActive;
-	private final LocalDate createdAt;
-	private final LocalDate updatedAt;
+    private final Long id;
+    private final String name;
+    private final String displayName;
+    private final Boolean isActive;
+    private final LocalDate createdAt;
+    private final LocalDate updatedAt;
+    private final Long templateId;
+    private final String templateName;
 
-	// associations
-	private final List<Event> events;
-	private final List<Field> config;
+    // associations
+    private final List<Event> events;
+    private final List<Field> config;
 
-	// template data
-	private final List<HookTemplateData> templates;
-	private final List<Grouping> groupings;
+    // template data
+    private final List<HookTemplateData> templates;
+    private final List<Grouping> groupings;
 
-	public static HookData instance(final Long id, final String name,
-			final String displayName, final boolean isActive,
-			final LocalDate createdAt, final LocalDate updatedAt,
-			final List<Event> registeredEvents, final List<Field> config) {
-		return new HookData(id, name, displayName, isActive, createdAt,
-				updatedAt, registeredEvents, config, null, null);
-	}
+    public static HookData instance(final Long id, final String name,
+            final String displayName, final boolean isActive,
+            final LocalDate createdAt, final LocalDate updatedAt,
+            final Long templateId, final List<Event> registeredEvents,
+            final List<Field> config, final String templateName) {
+        return new HookData(id, name, displayName, isActive, createdAt,
+                updatedAt, templateId, registeredEvents, config, templateName,
+                null, null);
+    }
 
-	public static HookData template(final List<HookTemplateData> templates,
-			final List<Grouping> groupings) {
-		return new HookData(null, null, null, null, null, null, null, null,
-				templates, groupings);
-	}
+    public static HookData template(final List<HookTemplateData> templates,
+            final List<Grouping> groupings) {
+        return new HookData(null, null, null, null, null, null, null, null,
+                null, null, templates, groupings);
+    }
 
-	public static HookData templateExisting(final HookData hookData,
-			final List<HookTemplateData> templates,
-			final List<Grouping> groupings) {
-		return new HookData(hookData.id, hookData.name, hookData.displayName,
-				hookData.isActive, hookData.createdAt, hookData.updatedAt,
-				hookData.events, hookData.config, templates, groupings);
-	}
+    public static HookData templateExisting(final HookData hookData,
+            final List<HookTemplateData> templates,
+            final List<Grouping> groupings) {
+        return new HookData(hookData.id, hookData.name, hookData.displayName,
+                hookData.isActive, hookData.createdAt, hookData.updatedAt,
+                hookData.templateId, hookData.events, hookData.config,
+                hookData.templateName, templates, groupings);
+    }
 
-	private HookData(final Long id, final String name,
-			final String displayName, final Boolean isActive,
-			final LocalDate createdAt, final LocalDate updatedAt,
-			final List<Event> events, final List<Field> config,
-			final List<HookTemplateData> templates,
-			final List<Grouping> groupings) {
-		this.id = id;
-		this.name = name;
-		this.displayName = displayName;
-		this.isActive = isActive;
-		this.createdAt = createdAt;
-		this.updatedAt = updatedAt;
+    private HookData(final Long id, final String name,
+            final String displayName, final Boolean isActive,
+            final LocalDate createdAt, final LocalDate updatedAt,
+            final Long templateId, final List<Event> events,
+            final List<Field> config, final String templateName,
+            final List<HookTemplateData> templates,
+            final List<Grouping> groupings) {
+        this.id = id;
+        this.name = name;
+        this.displayName = displayName;
+        this.isActive = isActive;
+        this.createdAt = createdAt;
+        this.updatedAt = updatedAt;
+        this.templateId = templateId;
+        this.templateName = templateName;
 
-		// associations
-		this.events = events;
-		this.config = config;
+        // associations
+        this.events = events;
+        this.config = config;
 
-		// template
-		this.templates = templates;
-		this.groupings = groupings;
+        // template
+        this.templates = templates;
+        this.groupings = groupings;
 
-	}
+    }
 
-	public Long getHookId() {
-		return this.id;
-	}
+    public Long getHookId() {
+        return this.id;
+    }
 
-	public List<HookTemplateData> getTemplates() {
-		return this.templates;
-	}
+    public List<HookTemplateData> getTemplates() {
+        return this.templates;
+    }
 
-	public List<Grouping> getGroupings() {
-		return this.groupings;
-	}
+    public List<Grouping> getGroupings() {
+        return this.groupings;
+    }
 
-	public String getTemplateName() {
-		return this.name;
-	}
+    public String getTemplateName() {
+        return this.name;
+    }
 
 }
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/domain/Hook.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/domain/Hook.java
index 6b0e16692..595138000 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/domain/Hook.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/domain/Hook.java
@@ -5,183 +5,198 @@
  */
 package org.mifosplatform.infrastructure.hooks.domain;
 
-import static org.mifosplatform.infrastructure.hooks.api.HookApiConstants.configParamName;
-import static org.mifosplatform.infrastructure.hooks.api.HookApiConstants.displayNameParamName;
-import static org.mifosplatform.infrastructure.hooks.api.HookApiConstants.eventsParamName;
-import static org.mifosplatform.infrastructure.hooks.api.HookApiConstants.isActiveParamName;
-
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
 import org.mifosplatform.infrastructure.core.api.JsonCommand;
 import org.mifosplatform.infrastructure.core.domain.AbstractAuditableCustom;
+import org.mifosplatform.template.domain.Template;
 import org.mifosplatform.useradministration.domain.AppUser;
 import org.springframework.util.CollectionUtils;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
+import javax.persistence.*;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
+import static org.mifosplatform.infrastructure.hooks.api.HookApiConstants.*;
 
 @Entity
 @Table(name = "m_hook")
 public class Hook extends AbstractAuditableCustom<AppUser, Long> {
 
-	@Column(name = "name", nullable = false, length = 100)
-	private String name;
+    @Column(name = "name", nullable = false, length = 100)
+    private String name;
 
-	@Column(name = "is_active", nullable = false)
-	private Boolean isActive;
+    @Column(name = "is_active", nullable = false)
+    private Boolean isActive;
 
-	@LazyCollection(LazyCollectionOption.FALSE)
-	@OneToMany(cascade = CascadeType.ALL, mappedBy = "hook", orphanRemoval = true)
-	private Set<HookResource> events = new HashSet<>();
+    @LazyCollection(LazyCollectionOption.FALSE)
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "hook", orphanRemoval = true)
+    private Set<HookResource> events = new HashSet<>();
 
-	@LazyCollection(LazyCollectionOption.FALSE)
-	@OneToMany(cascade = CascadeType.ALL, mappedBy = "hook", orphanRemoval = true)
-	private Set<HookConfiguration> config = new HashSet<>();
+    @LazyCollection(LazyCollectionOption.FALSE)
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "hook", orphanRemoval = true)
+    private Set<HookConfiguration> config = new HashSet<>();
 
-	@ManyToOne(optional = true)
-	@JoinColumn(name = "template_id", referencedColumnName = "id", nullable = false)
-	private HookTemplate template;
+    @ManyToOne(optional = true)
+    @JoinColumn(name = "template_id", referencedColumnName = "id", nullable = false)
+    private HookTemplate template;
 
-	protected Hook() {
-		//
-	}
+    @ManyToOne(optional = true)
+    @JoinColumn(name = "ugd_template_id", referencedColumnName = "id", nullable = false)
+    private Template ugdTemplate;
 
-	public static Hook fromJson(final JsonCommand command,
-			final HookTemplate template, final Set<HookConfiguration> config,
-			final Set<HookResource> events) {
-		final String displayName = command
-				.stringValueOfParameterNamed(displayNameParamName);
-		Boolean isActive = command
-				.booleanObjectValueOfParameterNamed(isActiveParamName);
-        if(isActive == null)
+    protected Hook() {
+        //
+    }
+
+    public static Hook fromJson(final JsonCommand command,
+            final HookTemplate template, final Set<HookConfiguration> config,
+            final Set<HookResource> events, final Template ugdTemplate) {
+        final String displayName = command
+                .stringValueOfParameterNamed(displayNameParamName);
+        Boolean isActive = command
+                .booleanObjectValueOfParameterNamed(isActiveParamName);
+        if (isActive == null)
             isActive = false;
-		return new Hook(template, displayName, isActive, config, events);
-	}
+        return new Hook(template, displayName, isActive, config, events,
+                ugdTemplate);
+    }
 
-	private Hook(final HookTemplate template, final String displayName,
-			final Boolean isActive, final Set<HookConfiguration> config,
-			final Set<HookResource> events) {
+    private Hook(final HookTemplate template, final String displayName,
+            final Boolean isActive, final Set<HookConfiguration> config,
+            final Set<HookResource> events, final Template ugdTemplate) {
 
-		this.template = template;
+        this.template = template;
 
-		if (StringUtils.isNotBlank(displayName)) {
-			this.name = displayName.trim();
-		} else {
-			this.name = template.getName();
-		}
-		this.isActive = isActive;
-		if (!CollectionUtils.isEmpty(config)) {
-			this.config = associateConfigWithThisHook(config);
-		}
-		if (!CollectionUtils.isEmpty(events)) {
-			this.events = associateEventsWithThisHook(events);
-		}
+        if (StringUtils.isNotBlank(displayName)) {
+            this.name = displayName.trim();
+        } else {
+            this.name = template.getName();
+        }
+        this.isActive = isActive;
+        if (!CollectionUtils.isEmpty(config)) {
+            this.config = associateConfigWithThisHook(config);
+        }
+        if (!CollectionUtils.isEmpty(events)) {
+            this.events = associateEventsWithThisHook(events);
+        }
 
-	}
+        this.ugdTemplate = ugdTemplate;
+    }
 
-	private Set<HookConfiguration> associateConfigWithThisHook(
-			final Set<HookConfiguration> config) {
-		for (final HookConfiguration hookConfiguration : config) {
-			hookConfiguration.update(this);
-		}
-		return config;
-	}
+    private Set<HookConfiguration> associateConfigWithThisHook(
+            final Set<HookConfiguration> config) {
+        for (final HookConfiguration hookConfiguration : config) {
+            hookConfiguration.update(this);
+        }
+        return config;
+    }
 
-	private Set<HookResource> associateEventsWithThisHook(
-			final Set<HookResource> events) {
-		for (final HookResource hookResource : events) {
-			hookResource.update(this);
-		}
-		return events;
-	}
+    private Set<HookResource> associateEventsWithThisHook(
+            final Set<HookResource> events) {
+        for (final HookResource hookResource : events) {
+            hookResource.update(this);
+        }
+        return events;
+    }
 
-	public HookTemplate getHookTemplate() {
-		return this.template;
-	}
+    public HookTemplate getHookTemplate() {
+        return this.template;
+    }
 
-	public Set<HookConfiguration> getHookConfig() {
-		return this.config;
-	}
+    public Template getUgdTemplate() {
+        return this.ugdTemplate;
+    }
 
-	public Map<String, Object> update(final JsonCommand command) {
+    public Long getUgdTemplateId() {
+        return this.ugdTemplate.getId();
+    }
 
-		final Map<String, Object> actualChanges = new LinkedHashMap<>(4);
+    public Set<HookConfiguration> getHookConfig() {
+        return this.config;
+    }
 
-		if (command.isChangeInStringParameterNamed(displayNameParamName,
-				this.name)) {
-			final String newValue = command
-					.stringValueOfParameterNamed(displayNameParamName);
-			actualChanges.put(displayNameParamName, newValue);
-			this.name = newValue;
-		}
+    public Map<String, Object> update(final JsonCommand command) {
 
-		if (command.isChangeInBooleanParameterNamed(isActiveParamName,
-				this.isActive)) {
-			final Boolean newValue = command
-					.booleanObjectValueOfParameterNamed(isActiveParamName);
-			actualChanges.put(isActiveParamName, newValue);
-			this.isActive = newValue;
-		}
+        final Map<String, Object> actualChanges = new LinkedHashMap<>(5);
 
-		// events
-		if (command.hasParameter(eventsParamName)) {
-			final JsonArray jsonArray = command
-					.arrayOfParameterNamed(eventsParamName);
-			if (jsonArray != null) {
-				actualChanges.put(eventsParamName, jsonArray);
-			}
-		}
+        if (command.isChangeInStringParameterNamed(displayNameParamName,
+                this.name)) {
+            final String newValue = command
+                    .stringValueOfParameterNamed(displayNameParamName);
+            actualChanges.put(displayNameParamName, newValue);
+            this.name = newValue;
+        }
 
-		// config
-		if (command.hasParameter(configParamName)) {
-			final JsonElement element = command.parsedJson().getAsJsonObject()
-					.get(configParamName);
-			if (element != null) {
-				actualChanges.put(configParamName, element);
-			}
-		}
+        if (command.isChangeInBooleanParameterNamed(isActiveParamName,
+                this.isActive)) {
+            final Boolean newValue = command
+                    .booleanObjectValueOfParameterNamed(isActiveParamName);
+            actualChanges.put(isActiveParamName, newValue);
+            this.isActive = newValue;
+        }
 
-		return actualChanges;
-	}
+        if (command.isChangeInLongParameterNamed(templateIdParamName,
+                getUgdTemplateId())) {
+            final Long newValue = command
+                    .longValueOfParameterNamed(templateIdParamName);
+            actualChanges.put(templateIdParamName, newValue);
+        }
 
-	public boolean updateEvents(final Set<HookResource> newHookEvents) {
-		if (newHookEvents == null) {
-			return false;
-		}
+        // events
+        if (command.hasParameter(eventsParamName)) {
+            final JsonArray jsonArray = command
+                    .arrayOfParameterNamed(eventsParamName);
+            if (jsonArray != null) {
+                actualChanges.put(eventsParamName, jsonArray);
+            }
+        }
 
-		if (this.events == null) {
-			this.events = new HashSet<>();
-		}
-		this.events.clear();
-		this.events.addAll(associateEventsWithThisHook(newHookEvents));
-		return true;
-	}
+        // config
+        if (command.hasParameter(configParamName)) {
+            final JsonElement element = command.parsedJson().getAsJsonObject()
+                    .get(configParamName);
+            if (element != null) {
+                actualChanges.put(configParamName, element);
+            }
+        }
 
-	public boolean updateConfig(final Set<HookConfiguration> newHookConfig) {
-		if (newHookConfig == null) {
-			return false;
-		}
+        return actualChanges;
+    }
 
-		if (this.config == null) {
-			this.config = new HashSet<>();
-		}
-		this.config.clear();
-		this.config.addAll(associateConfigWithThisHook(newHookConfig));
-		return true;
-	}
+    public boolean updateEvents(final Set<HookResource> newHookEvents) {
+        if (newHookEvents == null) {
+            return false;
+        }
+
+        if (this.events == null) {
+            this.events = new HashSet<>();
+        }
+        this.events.clear();
+        this.events.addAll(associateEventsWithThisHook(newHookEvents));
+        return true;
+    }
+
+    public boolean updateConfig(final Set<HookConfiguration> newHookConfig) {
+        if (newHookConfig == null) {
+            return false;
+        }
+
+        if (this.config == null) {
+            this.config = new HashSet<>();
+        }
+        this.config.clear();
+        this.config.addAll(associateConfigWithThisHook(newHookConfig));
+        return true;
+    }
+
+    public void updateUgdTemplate(final Template ugdTemplate) {
+        this.ugdTemplate = ugdTemplate;
+    }
 
 }
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/listener/MifosHookListener.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/listener/MifosHookListener.java
index e2831c953..ca051cae3 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/listener/MifosHookListener.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/listener/MifosHookListener.java
@@ -5,8 +5,6 @@
  */
 package org.mifosplatform.infrastructure.hooks.listener;
 
-import java.util.List;
-
 import org.mifosplatform.infrastructure.core.domain.MifosPlatformTenant;
 import org.mifosplatform.infrastructure.core.service.ThreadLocalContextUtil;
 import org.mifosplatform.infrastructure.hooks.domain.Hook;
@@ -20,48 +18,50 @@ import org.mifosplatform.useradministration.domain.AppUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class MifosHookListener implements HookListener {
 
-	private final HookProcessorProvider hookProcessorProvider;
-	private final HookReadPlatformService hookReadPlatformService;
-	private final TenantDetailsService tenantDetailsService;
+    private final HookProcessorProvider hookProcessorProvider;
+    private final HookReadPlatformService hookReadPlatformService;
+    private final TenantDetailsService tenantDetailsService;
 
-	@Autowired
-	public MifosHookListener(final HookProcessorProvider hookProcessorProvider,
-                        final HookReadPlatformService hookReadPlatformService,
-			final TenantDetailsService tenantDetailsService) {
-                this.hookReadPlatformService = hookReadPlatformService;
-		this.hookProcessorProvider = hookProcessorProvider;
-		this.tenantDetailsService = tenantDetailsService;
-	}
+    @Autowired
+    public MifosHookListener(final HookProcessorProvider hookProcessorProvider,
+            final HookReadPlatformService hookReadPlatformService,
+            final TenantDetailsService tenantDetailsService) {
+        this.hookReadPlatformService = hookReadPlatformService;
+        this.hookProcessorProvider = hookProcessorProvider;
+        this.tenantDetailsService = tenantDetailsService;
+    }
 
-	@Override
-	public void onApplicationEvent(final HookEvent event) {
+    @Override
+    public void onApplicationEvent(final HookEvent event) {
 
-		final String tenantIdentifier = event.getTenantIdentifier();
-		final MifosPlatformTenant tenant = this.tenantDetailsService
-				.loadTenantById(tenantIdentifier);
-		ThreadLocalContextUtil.setTenant(tenant);
+        final String tenantIdentifier = event.getTenantIdentifier();
+        final MifosPlatformTenant tenant = this.tenantDetailsService
+                .loadTenantById(tenantIdentifier);
+        ThreadLocalContextUtil.setTenant(tenant);
 
-		final AppUser appUser = event.getAppUser();
-		final String authToken = event.getAuthToken();
+        final AppUser appUser = event.getAppUser();
+        final String authToken = event.getAuthToken();
 
-		final HookEventSource hookEventSource = event.getSource();
-		final String entityName = hookEventSource.getEntityName();
-		final String actionName = hookEventSource.getActionName();
-		final String payload = event.getPayload();
-		
-		final List<Hook> hooks = this.hookReadPlatformService
-		        .retrieveHooksByEvent(hookEventSource.getEntityName(),
-		                hookEventSource.getActionName());
+        final HookEventSource hookEventSource = event.getSource();
+        final String entityName = hookEventSource.getEntityName();
+        final String actionName = hookEventSource.getActionName();
+        final String payload = event.getPayload();
 
-		for (final Hook hook : hooks) {
-			final HookProcessor processor = this.hookProcessorProvider
-					.getProcessor(hook);
-			processor.process(hook, appUser, payload, entityName, actionName,
-					tenantIdentifier, authToken);
-		}
-	}
+        final List<Hook> hooks = this.hookReadPlatformService
+                .retrieveHooksByEvent(hookEventSource.getEntityName(),
+                        hookEventSource.getActionName());
+
+        for (final Hook hook : hooks) {
+            final HookProcessor processor = this.hookProcessorProvider
+                    .getProcessor(hook);
+            processor.process(hook, appUser, payload, entityName, actionName,
+                    tenantIdentifier, authToken);
+        }
+    }
 
 }
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/processor/TwilioHookProcessor.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/processor/TwilioHookProcessor.java
index 667bd7388..a5e6048a3 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/processor/TwilioHookProcessor.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/processor/TwilioHookProcessor.java
@@ -5,79 +5,131 @@
  */
 package org.mifosplatform.infrastructure.hooks.processor;
 
-import static org.mifosplatform.infrastructure.hooks.api.HookApiConstants.apiKeyName;
-
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import org.codehaus.jackson.map.ObjectMapper;
 import org.mifosplatform.infrastructure.hooks.domain.Hook;
 import org.mifosplatform.infrastructure.hooks.domain.HookConfiguration;
 import org.mifosplatform.infrastructure.hooks.domain.HookConfigurationRepository;
 import org.mifosplatform.infrastructure.hooks.processor.data.SmsProviderData;
+import org.mifosplatform.portfolio.client.domain.Client;
+import org.mifosplatform.portfolio.client.domain.ClientRepository;
+import org.mifosplatform.template.service.TemplateMergeService;
 import org.mifosplatform.useradministration.domain.AppUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import retrofit.Callback;
 
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.mifosplatform.infrastructure.hooks.api.HookApiConstants.apiKeyName;
 
 @Service
 public class TwilioHookProcessor implements HookProcessor {
 
-	private final HookConfigurationRepository hookConfigurationRepository;
+    private final HookConfigurationRepository hookConfigurationRepository;
+    private final TemplateMergeService templateMergeService;
+    private final ClientRepository clientRepository;
 
-	@Autowired
-	public TwilioHookProcessor(
-			final HookConfigurationRepository hookConfigurationRepository) {
-		this.hookConfigurationRepository = hookConfigurationRepository;
-	}
+    @Autowired
+    public TwilioHookProcessor(
+            final HookConfigurationRepository hookConfigurationRepository,
+            final TemplateMergeService templateMergeService,
+            final ClientRepository clientRepository) {
+        this.hookConfigurationRepository = hookConfigurationRepository;
+        this.templateMergeService = templateMergeService;
+        this.clientRepository = clientRepository;
+    }
 
-	@Override
-	public void process(final Hook hook,
-			@SuppressWarnings("unused") final AppUser appUser,
-			final String payload, final String entityName,
-			final String actionName, final String tenantIdentifier,
-			final String authToken) {
+    @Override
+    public void process(final Hook hook,
+            @SuppressWarnings("unused") final AppUser appUser,
+            final String payload, final String entityName,
+            final String actionName, final String tenantIdentifier,
+            final String authToken) {
 
-		final SmsProviderData smsProviderData = new SmsProviderData(
-				hook.getHookConfig());
+        final SmsProviderData smsProviderData = new SmsProviderData(
+                hook.getHookConfig());
 
-		sendRequest(smsProviderData, payload, entityName, actionName,
-				tenantIdentifier, authToken, hook);
-	}
+        sendRequest(smsProviderData, payload, entityName, actionName,
+                tenantIdentifier, authToken, hook);
+    }
 
-	@SuppressWarnings("unchecked")
-	private void sendRequest(final SmsProviderData smsProviderData,
-			final String payload, final String entityName,
-			final String actionName, final String tenantIdentifier,
-			final String authToken, final Hook hook) {
+    @SuppressWarnings("unchecked")
+    private void sendRequest(final SmsProviderData smsProviderData,
+            final String payload, String entityName, String actionName,
+            final String tenantIdentifier, final String authToken,
+            final Hook hook) {
 
-		final WebHookService service = ProcessorHelper
-				.createWebHookService(smsProviderData.getUrl());
+        final WebHookService service = ProcessorHelper
+                .createWebHookService(smsProviderData.getUrl());
 
-		@SuppressWarnings("rawtypes")
-		final Callback callback = ProcessorHelper
-				.createCallback(smsProviderData.getUrl());
+        @SuppressWarnings("rawtypes")
+        final Callback callback = ProcessorHelper
+                .createCallback(smsProviderData.getUrl());
 
-		String apiKey = this.hookConfigurationRepository
-				.findOneByHookIdAndFieldName(hook.getId(), apiKeyName);
-		if (apiKey == null) {
-			smsProviderData.setUrl(null);
-			smsProviderData.setEndpoint(System.getProperty("baseUrl"));
-			smsProviderData.setTenantId(tenantIdentifier);
-			smsProviderData.setMifosToken(authToken);
-			apiKey = service.sendSmsBridgeConfigRequest(smsProviderData);
-			final HookConfiguration apiKeyEntry = HookConfiguration.createNew(
-					hook, "string", apiKeyName, apiKey);
-			this.hookConfigurationRepository.save(apiKeyEntry);
-		}
+        String apiKey = this.hookConfigurationRepository
+                .findOneByHookIdAndFieldName(hook.getId(), apiKeyName);
+        if (apiKey == null) {
+            smsProviderData.setUrl(null);
+            smsProviderData.setEndpoint(System.getProperty("baseUrl"));
+            smsProviderData.setTenantId(tenantIdentifier);
+            smsProviderData.setMifosToken(authToken);
+            apiKey = service.sendSmsBridgeConfigRequest(smsProviderData);
+            final HookConfiguration apiKeyEntry = HookConfiguration.createNew(
+                    hook, "string", apiKeyName, apiKey);
+            this.hookConfigurationRepository.save(apiKeyEntry);
+        }
 
-		if (apiKey != null && !apiKey.equals("")) {
-			final JsonObject json = new JsonParser().parse(payload)
-					.getAsJsonObject();
-			service.sendSmsBridgeRequest(entityName, actionName,
-					tenantIdentifier, apiKey, json, callback);
-		}
+        if (apiKey != null && !apiKey.equals("")) {
+            JsonObject json = null;
+            if (hook.getUgdTemplate() != null) {
+                entityName = "sms";
+                actionName = "send";
+                json = processUgdTemplate(payload, hook, authToken);
+                if (json == null) {
+                    return;
+                }
+            } else {
+                json = new JsonParser().parse(payload).getAsJsonObject();
+            }
+            service.sendSmsBridgeRequest(entityName, actionName,
+                    tenantIdentifier, apiKey, json, callback);
+        }
 
-	}
+    }
+
+    private JsonObject processUgdTemplate(final String payload,
+            final Hook hook, final String authToken) {
+        JsonObject json = null;
+        try {
+            @SuppressWarnings("unchecked")
+            final HashMap<String, Object> map = new ObjectMapper().readValue(
+                    payload, HashMap.class);
+            map.put("BASE_URI", System.getProperty("baseUrl"));
+            if (map.containsKey("clientId")) {
+                final Long clientId = new Long(Integer.toString((int) map
+                        .get("clientId")));
+                final Client client = this.clientRepository.findOne(clientId);
+                final String mobileNo = client.mobileNo();
+                if (mobileNo != null && !mobileNo.isEmpty()) {
+                    this.templateMergeService.setAuthToken(authToken);
+                    final String compiledMessage = this.templateMergeService
+                            .compile(hook.getUgdTemplate(), map)
+                            .replace("<p>", "").replace("</p>", "");
+                    final Map<String, String> jsonMap = new HashMap<>();
+                    jsonMap.put("mobileNo", mobileNo);
+                    jsonMap.put("message", compiledMessage);
+                    final String jsonString = new Gson().toJson(jsonMap);
+                    json = new JsonParser().parse(jsonString).getAsJsonObject();
+                }
+            }
+        } catch (IOException e) {
+        }
+        return json;
+    }
 
 }
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/serialization/HookCommandFromApiJsonDeserializer.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/serialization/HookCommandFromApiJsonDeserializer.java
index 575270c05..551489784 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/serialization/HookCommandFromApiJsonDeserializer.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/serialization/HookCommandFromApiJsonDeserializer.java
@@ -5,98 +5,112 @@
  */
 package org.mifosplatform.infrastructure.hooks.serialization;
 
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
+import com.google.gson.JsonElement;
+import com.google.gson.reflect.TypeToken;
 import org.apache.commons.lang.StringUtils;
 import org.mifosplatform.infrastructure.core.data.ApiParameterError;
 import org.mifosplatform.infrastructure.core.data.DataValidatorBuilder;
 import org.mifosplatform.infrastructure.core.exception.InvalidJsonException;
 import org.mifosplatform.infrastructure.core.exception.PlatformApiDataValidationException;
 import org.mifosplatform.infrastructure.core.serialization.FromJsonHelper;
+import org.mifosplatform.infrastructure.hooks.api.HookApiConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.google.gson.JsonElement;
-import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
+import java.util.*;
 
 @Component
 public class HookCommandFromApiJsonDeserializer {
 
-	/**
-	 * The parameters supported for this command.
-	 */
-	private final Set<String> supportedParameters = new HashSet<>(
-			Arrays.asList("name", "displayName", "isActive", "events", "config"));
-	private final FromJsonHelper fromApiJsonHelper;
+    /**
+     * The parameters supported for this command.
+     */
+    private final Set<String> supportedParameters = new HashSet<>(
+            Arrays.asList("name", "displayName", "isActive", "events",
+                    "config", "templateId"));
+    private final FromJsonHelper fromApiJsonHelper;
 
-	@Autowired
-	public HookCommandFromApiJsonDeserializer(
-			final FromJsonHelper fromApiJsonHelper) {
-		this.fromApiJsonHelper = fromApiJsonHelper;
-	}
+    @Autowired
+    public HookCommandFromApiJsonDeserializer(
+            final FromJsonHelper fromApiJsonHelper) {
+        this.fromApiJsonHelper = fromApiJsonHelper;
+    }
 
-	public void validateForCreate(final String json) {
-		if (StringUtils.isBlank(json)) {
-			throw new InvalidJsonException();
-		}
+    public void validateForCreate(final String json) {
+        if (StringUtils.isBlank(json)) {
+            throw new InvalidJsonException();
+        }
 
-		final Type typeOfMap = new TypeToken<Map<String, Object>>() {
-		}.getType();
-		this.fromApiJsonHelper.checkForUnsupportedParameters(typeOfMap, json,
-				this.supportedParameters);
+        final Type typeOfMap = new TypeToken<Map<String, Object>>() {
+        }.getType();
+        this.fromApiJsonHelper.checkForUnsupportedParameters(typeOfMap, json,
+                this.supportedParameters);
 
-		final List<ApiParameterError> dataValidationErrors = new ArrayList<>();
-		final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(
-				dataValidationErrors).resource("hook");
+        final List<ApiParameterError> dataValidationErrors = new ArrayList<>();
+        final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(
+                dataValidationErrors).resource("hook");
 
-		final JsonElement element = this.fromApiJsonHelper.parse(json);
+        final JsonElement element = this.fromApiJsonHelper.parse(json);
 
-		final String name = this.fromApiJsonHelper.extractStringNamed("name",
-				element);
-		baseDataValidator.reset().parameter("name").value(name).notBlank()
-				.notExceedingLengthOf(100);
+        final String name = this.fromApiJsonHelper.extractStringNamed("name",
+                element);
+        baseDataValidator.reset().parameter("name").value(name).notBlank()
+                .notExceedingLengthOf(100);
 
-		throwExceptionIfValidationWarningsExist(dataValidationErrors);
-	}
+        if (this.fromApiJsonHelper.parameterExists(
+                HookApiConstants.templateIdParamName, element)) {
+            final Long templateId = this.fromApiJsonHelper.extractLongNamed(
+                    HookApiConstants.templateIdParamName, element);
+            baseDataValidator.reset()
+                    .parameter(HookApiConstants.templateIdParamName)
+                    .value(templateId).notNull().integerGreaterThanZero();
+        }
 
-	public void validateForUpdate(final String json) {
-		if (StringUtils.isBlank(json)) {
-			throw new InvalidJsonException();
-		}
+        throwExceptionIfValidationWarningsExist(dataValidationErrors);
+    }
 
-		final Type typeOfMap = new TypeToken<Map<String, Object>>() {
-		}.getType();
-		this.fromApiJsonHelper.checkForUnsupportedParameters(typeOfMap, json,
-				this.supportedParameters);
+    public void validateForUpdate(final String json) {
+        if (StringUtils.isBlank(json)) {
+            throw new InvalidJsonException();
+        }
 
-		final List<ApiParameterError> dataValidationErrors = new ArrayList<>();
-		final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(
-				dataValidationErrors).resource("hook");
+        final Type typeOfMap = new TypeToken<Map<String, Object>>() {
+        }.getType();
+        this.fromApiJsonHelper.checkForUnsupportedParameters(typeOfMap, json,
+                this.supportedParameters);
 
-		final JsonElement element = this.fromApiJsonHelper.parse(json);
-		if (this.fromApiJsonHelper.parameterExists("name", element)) {
-			final String name = this.fromApiJsonHelper.extractStringNamed(
-					"name", element);
-			baseDataValidator.reset().parameter("name").value(name).notBlank()
-					.notExceedingLengthOf(100);
-		}
+        final List<ApiParameterError> dataValidationErrors = new ArrayList<>();
+        final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(
+                dataValidationErrors).resource("hook");
 
-		throwExceptionIfValidationWarningsExist(dataValidationErrors);
-	}
+        final JsonElement element = this.fromApiJsonHelper.parse(json);
+        if (this.fromApiJsonHelper.parameterExists("name", element)) {
+            final String name = this.fromApiJsonHelper.extractStringNamed(
+                    "name", element);
+            baseDataValidator.reset().parameter("name").value(name).notBlank()
+                    .notExceedingLengthOf(100);
+        }
 
-	private void throwExceptionIfValidationWarningsExist(
-			final List<ApiParameterError> dataValidationErrors) {
-		if (!dataValidationErrors.isEmpty()) {
-			throw new PlatformApiDataValidationException(
-					"validation.msg.validation.errors.exist",
-					"Validation errors exist.", dataValidationErrors);
-		}
-	}
+        if (this.fromApiJsonHelper.parameterExists(
+                HookApiConstants.templateIdParamName, element)) {
+            final Long templateId = this.fromApiJsonHelper.extractLongNamed(
+                    HookApiConstants.templateIdParamName, element);
+            baseDataValidator.reset()
+                    .parameter(HookApiConstants.templateIdParamName)
+                    .value(templateId).notNull().integerGreaterThanZero();
+        }
+
+        throwExceptionIfValidationWarningsExist(dataValidationErrors);
+    }
+
+    private void throwExceptionIfValidationWarningsExist(
+            final List<ApiParameterError> dataValidationErrors) {
+        if (!dataValidationErrors.isEmpty()) {
+            throw new PlatformApiDataValidationException(
+                    "validation.msg.validation.errors.exist",
+                    "Validation errors exist.", dataValidationErrors);
+        }
+    }
 
 }
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/service/HookReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/service/HookReadPlatformServiceImpl.java
index bd12ce661..72402eb4f 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/service/HookReadPlatformServiceImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/service/HookReadPlatformServiceImpl.java
@@ -5,20 +5,10 @@
  */
 package org.mifosplatform.infrastructure.hooks.service;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.List;
-
 import org.joda.time.LocalDate;
 import org.mifosplatform.infrastructure.core.domain.JdbcSupport;
 import org.mifosplatform.infrastructure.core.service.RoutingDataSource;
-import org.mifosplatform.infrastructure.hooks.data.Event;
-import org.mifosplatform.infrastructure.hooks.data.EventResultSetExtractor;
-import org.mifosplatform.infrastructure.hooks.data.Field;
-import org.mifosplatform.infrastructure.hooks.data.Grouping;
-import org.mifosplatform.infrastructure.hooks.data.HookData;
-import org.mifosplatform.infrastructure.hooks.data.HookTemplateData;
+import org.mifosplatform.infrastructure.hooks.data.*;
 import org.mifosplatform.infrastructure.hooks.domain.Hook;
 import org.mifosplatform.infrastructure.hooks.domain.HookRepository;
 import org.mifosplatform.infrastructure.hooks.exception.HookNotFoundException;
@@ -30,227 +20,238 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.List;
+
 @Service
 public class HookReadPlatformServiceImpl implements HookReadPlatformService {
 
-	private final JdbcTemplate jdbcTemplate;
-        private final HookRepository hookRepository;
-	private final PlatformSecurityContext context;
+    private final JdbcTemplate jdbcTemplate;
+    private final HookRepository hookRepository;
+    private final PlatformSecurityContext context;
 
-	@Autowired
-	public HookReadPlatformServiceImpl(final PlatformSecurityContext context,
-			final HookRepository hookRepository,
-			final RoutingDataSource dataSource) {
-		this.context = context;
-                this.hookRepository = hookRepository;
-		this.jdbcTemplate = new JdbcTemplate(dataSource);
-	}
+    @Autowired
+    public HookReadPlatformServiceImpl(final PlatformSecurityContext context,
+            final HookRepository hookRepository,
+            final RoutingDataSource dataSource) {
+        this.context = context;
+        this.hookRepository = hookRepository;
+        this.jdbcTemplate = new JdbcTemplate(dataSource);
+    }
 
-	@Override
-	public Collection<HookData> retrieveAllHooks() {
-		this.context.authenticatedUser();
-		final HookMapper rm = new HookMapper(this.jdbcTemplate);
-		final String sql = "select " + rm.schema() + " order by h.name";
+    @Override
+    public Collection<HookData> retrieveAllHooks() {
+        this.context.authenticatedUser();
+        final HookMapper rm = new HookMapper(this.jdbcTemplate);
+        final String sql = "select " + rm.schema() + " order by h.name";
 
-		return this.jdbcTemplate.query(sql, rm, new Object[] {});
-	}
+        return this.jdbcTemplate.query(sql, rm, new Object[]{});
+    }
 
-	@Override
-	public HookData retrieveHook(final Long hookId) {
-		try {
-			this.context.authenticatedUser();
-			final HookMapper rm = new HookMapper(this.jdbcTemplate);
-			final String sql = "select " + rm.schema() + " where h.id = ?";
+    @Override
+    public HookData retrieveHook(final Long hookId) {
+        try {
+            this.context.authenticatedUser();
+            final HookMapper rm = new HookMapper(this.jdbcTemplate);
+            final String sql = "select " + rm.schema() + " where h.id = ?";
 
-			return this.jdbcTemplate.queryForObject(sql, rm,
-					new Object[] { hookId });
-		} catch (final EmptyResultDataAccessException e) {
-			throw new HookNotFoundException(hookId);
-		}
+            return this.jdbcTemplate.queryForObject(sql, rm,
+                    new Object[]{hookId});
+        } catch (final EmptyResultDataAccessException e) {
+            throw new HookNotFoundException(hookId);
+        }
 
-	}
+    }
 
-	@Override
-	@Cacheable(value = "hooks", key = "T(org.mifosplatform.infrastructure.core.service.ThreadLocalContextUtil).getTenant().getTenantIdentifier().concat('HK')")
-	public List<Hook> retrieveHooksByEvent(final String actionName,
-			final String entityName) {
+    @Override
+    @Cacheable(value = "hooks", key = "T(org.mifosplatform.infrastructure.core.service.ThreadLocalContextUtil).getTenant().getTenantIdentifier().concat('HK')")
+    public List<Hook> retrieveHooksByEvent(final String actionName,
+            final String entityName) {
 
-		return this.hookRepository.findAllHooksListeningToEvent(actionName,
-				entityName);
-	}
+        return this.hookRepository.findAllHooksListeningToEvent(actionName,
+                entityName);
+    }
 
-	@Override
-	public HookData retrieveNewHookDetails(final String templateName) {
+    @Override
+    public HookData retrieveNewHookDetails(final String templateName) {
 
-		this.context.authenticatedUser();
-		final TemplateMapper rm = new TemplateMapper(this.jdbcTemplate);
-		final String sql;
-		List<HookTemplateData> templateData;
+        this.context.authenticatedUser();
+        final TemplateMapper rm = new TemplateMapper(this.jdbcTemplate);
+        final String sql;
+        List<HookTemplateData> templateData;
 
-		if (templateName == null) {
-			sql = "select " + rm.schema() + " order by s.name";
-			templateData = this.jdbcTemplate.query(sql, rm, new Object[] {});
-		} else {
-			sql = "select " + rm.schema() + " where s.name = ? order by s.name";
-			templateData = this.jdbcTemplate.query(sql, rm,
-					new Object[] { templateName });
-		}
+        if (templateName == null) {
+            sql = "select " + rm.schema() + " order by s.name";
+            templateData = this.jdbcTemplate.query(sql, rm, new Object[]{});
+        } else {
+            sql = "select " + rm.schema() + " where s.name = ? order by s.name";
+            templateData = this.jdbcTemplate.query(sql, rm,
+                    new Object[]{templateName});
+        }
 
-		final List<Grouping> events = getTemplateForEvents();
+        final List<Grouping> events = getTemplateForEvents();
 
-		return HookData.template(templateData, events);
-	}
+        return HookData.template(templateData, events);
+    }
 
-	private List<Grouping> getTemplateForEvents() {
-		final String sql = "select p.grouping, p.entity_name, p.action_name from m_permission p "
-				+ " where p.action_name NOT LIKE '%CHECKER%' AND p.action_name NOT LIKE '%READ%' "
-				+ " order by p.grouping, p.entity_name ";
-		final EventResultSetExtractor extractor = new EventResultSetExtractor();
-		return this.jdbcTemplate.query(sql, extractor);
-	}
+    private List<Grouping> getTemplateForEvents() {
+        final String sql = "select p.grouping, p.entity_name, p.action_name from m_permission p "
+                + " where p.action_name NOT LIKE '%CHECKER%' AND p.action_name NOT LIKE '%READ%' "
+                + " order by p.grouping, p.entity_name ";
+        final EventResultSetExtractor extractor = new EventResultSetExtractor();
+        return this.jdbcTemplate.query(sql, extractor);
+    }
 
-	private static final class HookMapper implements RowMapper<HookData> {
+    private static final class HookMapper implements RowMapper<HookData> {
 
-		private final JdbcTemplate jdbcTemplate;
+        private final JdbcTemplate jdbcTemplate;
 
-		public HookMapper(final JdbcTemplate jdbcTemplate) {
-			this.jdbcTemplate = jdbcTemplate;
-		}
+        public HookMapper(final JdbcTemplate jdbcTemplate) {
+            this.jdbcTemplate = jdbcTemplate;
+        }
 
-		public String schema() {
-			return " h.id, s.name as name, h.name as display_name, h.is_active, h.created_date, h.lastmodified_date "
-					+ " from m_hook h inner join m_hook_templates s on h.template_id = s.id ";
-		}
+        public String schema() {
+            return " h.id, s.name as name, h.name as display_name, h.is_active, h.created_date,"
+                    + " h.lastmodified_date, h.ugd_template_id, tp.name as ugd_template_name, "
+                    + "h.ugd_template_id from m_hook h inner join m_hook_templates s on h.template_id = s.id"
+                    + " inner join m_template tp on h.ugd_template_id = tp.id";
+        }
 
-		@Override
-		public HookData mapRow(final ResultSet rs,
-				@SuppressWarnings("unused") final int rowNum)
-				throws SQLException {
+        @Override
+        public HookData mapRow(final ResultSet rs,
+                @SuppressWarnings("unused") final int rowNum)
+                throws SQLException {
 
-			final Long id = rs.getLong("id");
-			final String name = rs.getString("name");
-			final String displayname = rs.getString("display_name");
-			final boolean isActive = rs.getBoolean("is_active");
-			final LocalDate createdAt = JdbcSupport.getLocalDate(rs,
-					"created_date");
-			final LocalDate updatedAt = JdbcSupport.getLocalDate(rs,
-					"lastmodified_date");
-			final List<Event> registeredEvents = retrieveEvents(id);
-			final List<Field> config = retrieveConfig(id);
+            final Long id = rs.getLong("id");
+            final String name = rs.getString("name");
+            final String displayname = rs.getString("display_name");
+            final boolean isActive = rs.getBoolean("is_active");
+            final LocalDate createdAt = JdbcSupport.getLocalDate(rs,
+                    "created_date");
+            final LocalDate updatedAt = JdbcSupport.getLocalDate(rs,
+                    "lastmodified_date");
+            final Long templateId = rs.getLong("ugd_template_id");
+            final String templateName = rs.getString("ugd_template_name");
+            final List<Event> registeredEvents = retrieveEvents(id);
+            final List<Field> config = retrieveConfig(id);
 
-			return HookData.instance(id, name, displayname, isActive,
-					createdAt, updatedAt, registeredEvents, config);
-		}
+            return HookData.instance(id, name, displayname, isActive,
+                    createdAt, updatedAt, templateId, registeredEvents, config,
+                    templateName);
+        }
 
-		private List<Event> retrieveEvents(final Long hookId) {
+        private List<Event> retrieveEvents(final Long hookId) {
 
-			final HookEventMapper rm = new HookEventMapper();
-			final String sql = "select " + rm.schema() + " where h.id= ?";
+            final HookEventMapper rm = new HookEventMapper();
+            final String sql = "select " + rm.schema() + " where h.id= ?";
 
-			return this.jdbcTemplate.query(sql, rm, new Object[] { hookId });
-		}
+            return this.jdbcTemplate.query(sql, rm, new Object[]{hookId});
+        }
 
-		private List<Field> retrieveConfig(final Long hookId) {
+        private List<Field> retrieveConfig(final Long hookId) {
 
-			final HookConfigMapper rm = new HookConfigMapper();
-			final String sql = "select " + rm.schema()
-					+ " where h.id= ? order by hc.field_name";
+            final HookConfigMapper rm = new HookConfigMapper();
+            final String sql = "select " + rm.schema()
+                    + " where h.id= ? order by hc.field_name";
 
-			final List<Field> fields = this.jdbcTemplate.query(sql, rm,
-					new Object[] { hookId });
+            final List<Field> fields = this.jdbcTemplate.query(sql, rm,
+                    new Object[]{hookId});
 
-			return fields;
-		}
-	}
+            return fields;
+        }
+    }
 
-	private static final class HookEventMapper implements RowMapper<Event> {
+    private static final class HookEventMapper implements RowMapper<Event> {
 
-		public String schema() {
-			return " re.action_name, re.entity_name from m_hook h inner join m_hook_registered_events re on h.id = re.hook_id ";
-		}
+        public String schema() {
+            return " re.action_name, re.entity_name from m_hook h inner join m_hook_registered_events re on h.id = re.hook_id ";
+        }
 
-		@Override
-		public Event mapRow(final ResultSet rs,
-				@SuppressWarnings("unused") final int rowNum)
-				throws SQLException {
-			final String actionName = rs.getString("action_name");
-			final String entityName = rs.getString("entity_name");
-			return Event.instance(actionName, entityName);
-		}
-	}
+        @Override
+        public Event mapRow(final ResultSet rs,
+                @SuppressWarnings("unused") final int rowNum)
+                throws SQLException {
+            final String actionName = rs.getString("action_name");
+            final String entityName = rs.getString("entity_name");
+            return Event.instance(actionName, entityName);
+        }
+    }
 
-	private static final class HookConfigMapper implements RowMapper<Field> {
+    private static final class HookConfigMapper implements RowMapper<Field> {
 
-		public String schema() {
-			return " hc.field_name, hc.field_value from m_hook h inner join m_hook_configuration hc on h.id = hc.hook_id ";
-		}
+        public String schema() {
+            return " hc.field_name, hc.field_value from m_hook h inner join m_hook_configuration hc on h.id = hc.hook_id ";
+        }
 
-		@Override
-		public Field mapRow(final ResultSet rs,
-				@SuppressWarnings("unused") final int rowNum)
-				throws SQLException {
-			final String fieldName = rs.getString("field_name");
-			final String fieldValue = rs.getString("field_value");
-			return Field.fromConfig(fieldName, fieldValue);
-		}
-	}
+        @Override
+        public Field mapRow(final ResultSet rs,
+                @SuppressWarnings("unused") final int rowNum)
+                throws SQLException {
+            final String fieldName = rs.getString("field_name");
+            final String fieldValue = rs.getString("field_value");
+            return Field.fromConfig(fieldName, fieldValue);
+        }
+    }
 
-	private static final class TemplateMapper implements
-			RowMapper<HookTemplateData> {
+    private static final class TemplateMapper
+            implements
+                RowMapper<HookTemplateData> {
 
-		private final JdbcTemplate jdbcTemplate;
+        private final JdbcTemplate jdbcTemplate;
 
-		public TemplateMapper(final JdbcTemplate jdbcTemplate) {
-			this.jdbcTemplate = jdbcTemplate;
-		}
+        public TemplateMapper(final JdbcTemplate jdbcTemplate) {
+            this.jdbcTemplate = jdbcTemplate;
+        }
 
-		public String schema() {
-			return " s.id, s.name from m_hook_templates s ";
-		}
+        public String schema() {
+            return " s.id, s.name from m_hook_templates s ";
+        }
 
-		@Override
-		public HookTemplateData mapRow(final ResultSet rs,
-				@SuppressWarnings("unused") final int rowNum)
-				throws SQLException {
+        @Override
+        public HookTemplateData mapRow(final ResultSet rs,
+                @SuppressWarnings("unused") final int rowNum)
+                throws SQLException {
 
-			final Long id = rs.getLong("id");
-			final String name = rs.getString("name");
-			final List<Field> schema = retrieveSchema(id);
+            final Long id = rs.getLong("id");
+            final String name = rs.getString("name");
+            final List<Field> schema = retrieveSchema(id);
 
-			return HookTemplateData.instance(id, name, schema);
-		}
+            return HookTemplateData.instance(id, name, schema);
+        }
 
-		private List<Field> retrieveSchema(final Long templateId) {
+        private List<Field> retrieveSchema(final Long templateId) {
 
-			final TemplateSchemaMapper rm = new TemplateSchemaMapper();
-			final String sql = "select " + rm.schema()
-					+ " where s.id= ? order by hs.field_name ";
+            final TemplateSchemaMapper rm = new TemplateSchemaMapper();
+            final String sql = "select " + rm.schema()
+                    + " where s.id= ? order by hs.field_name ";
 
-			final List<Field> fields = this.jdbcTemplate.query(sql, rm,
-					new Object[] { templateId });
+            final List<Field> fields = this.jdbcTemplate.query(sql, rm,
+                    new Object[]{templateId});
 
-			return fields;
-		}
-	}
+            return fields;
+        }
+    }
 
-	private static final class TemplateSchemaMapper implements RowMapper<Field> {
+    private static final class TemplateSchemaMapper implements RowMapper<Field> {
 
-		public String schema() {
-			return " hs.field_type, hs.field_name, hs.placeholder, hs.optional from m_hook_templates s "
-					+ " inner join m_hook_schema hs on s.id = hs.hook_template_id ";
-		}
+        public String schema() {
+            return " hs.field_type, hs.field_name, hs.placeholder, hs.optional from m_hook_templates s "
+                    + " inner join m_hook_schema hs on s.id = hs.hook_template_id ";
+        }
 
-		@Override
-		public Field mapRow(final ResultSet rs,
-				@SuppressWarnings("unused") final int rowNum)
-				throws SQLException {
-			final String fieldName = rs.getString("field_name");
-			final String fieldType = rs.getString("field_type");
-			final Boolean optional = rs.getBoolean("optional");
-			final String placeholder = rs.getString("placeholder");
-			return Field
-					.fromSchema(fieldType, fieldName, optional, placeholder);
-		}
-	}
+        @Override
+        public Field mapRow(final ResultSet rs,
+                @SuppressWarnings("unused") final int rowNum)
+                throws SQLException {
+            final String fieldName = rs.getString("field_name");
+            final String fieldType = rs.getString("field_type");
+            final Boolean optional = rs.getBoolean("optional");
+            final String placeholder = rs.getString("placeholder");
+            return Field
+                    .fromSchema(fieldType, fieldName, optional, placeholder);
+        }
+    }
 
 }
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/service/HookWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/service/HookWritePlatformServiceJpaRepositoryImpl.java
index f837ffc7a..daa5c3fb3 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/service/HookWritePlatformServiceJpaRepositoryImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/hooks/service/HookWritePlatformServiceJpaRepositoryImpl.java
@@ -5,22 +5,8 @@
  */
 package org.mifosplatform.infrastructure.hooks.service;
 
-import static org.mifosplatform.infrastructure.hooks.api.HookApiConstants.actionNameParamName;
-import static org.mifosplatform.infrastructure.hooks.api.HookApiConstants.configParamName;
-import static org.mifosplatform.infrastructure.hooks.api.HookApiConstants.contentTypeName;
-import static org.mifosplatform.infrastructure.hooks.api.HookApiConstants.entityNameParamName;
-import static org.mifosplatform.infrastructure.hooks.api.HookApiConstants.eventsParamName;
-import static org.mifosplatform.infrastructure.hooks.api.HookApiConstants.nameParamName;
-import static org.mifosplatform.infrastructure.hooks.api.HookApiConstants.payloadURLName;
-import static org.mifosplatform.infrastructure.hooks.api.HookApiConstants.webTemplateName;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
 import org.mifosplatform.infrastructure.core.api.JsonCommand;
 import org.mifosplatform.infrastructure.core.data.ApiParameterError;
 import org.mifosplatform.infrastructure.core.data.CommandProcessingResult;
@@ -29,313 +15,338 @@ import org.mifosplatform.infrastructure.core.data.DataValidatorBuilder;
 import org.mifosplatform.infrastructure.core.exception.PlatformApiDataValidationException;
 import org.mifosplatform.infrastructure.core.exception.PlatformDataIntegrityException;
 import org.mifosplatform.infrastructure.core.serialization.FromJsonHelper;
-import org.mifosplatform.infrastructure.hooks.domain.Hook;
-import org.mifosplatform.infrastructure.hooks.domain.HookConfiguration;
-import org.mifosplatform.infrastructure.hooks.domain.HookRepository;
-import org.mifosplatform.infrastructure.hooks.domain.HookResource;
-import org.mifosplatform.infrastructure.hooks.domain.HookTemplate;
-import org.mifosplatform.infrastructure.hooks.domain.HookTemplateRepository;
-import org.mifosplatform.infrastructure.hooks.domain.Schema;
+import org.mifosplatform.infrastructure.hooks.domain.*;
 import org.mifosplatform.infrastructure.hooks.exception.HookNotFoundException;
 import org.mifosplatform.infrastructure.hooks.exception.HookTemplateNotFoundException;
 import org.mifosplatform.infrastructure.hooks.processor.ProcessorHelper;
 import org.mifosplatform.infrastructure.hooks.processor.WebHookService;
 import org.mifosplatform.infrastructure.hooks.serialization.HookCommandFromApiJsonDeserializer;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
+import org.mifosplatform.template.domain.Template;
+import org.mifosplatform.template.domain.TemplateRepository;
+import org.mifosplatform.template.exception.TemplateNotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import retrofit.RetrofitError;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
+import java.util.*;
+import java.util.Map.Entry;
+
+import static org.mifosplatform.infrastructure.hooks.api.HookApiConstants.*;
 
 @Service
-public class HookWritePlatformServiceJpaRepositoryImpl implements
-		HookWritePlatformService {
+public class HookWritePlatformServiceJpaRepositoryImpl
+        implements
+            HookWritePlatformService {
 
-	private final PlatformSecurityContext context;
-	private final HookRepository hookRepository;
-	private final HookTemplateRepository hookTemplateRepository;
-	private final HookCommandFromApiJsonDeserializer fromApiJsonDeserializer;
-	private final FromJsonHelper fromApiJsonHelper;
+    private final PlatformSecurityContext context;
+    private final HookRepository hookRepository;
+    private final HookTemplateRepository hookTemplateRepository;
+    private final TemplateRepository ugdTemplateRepository;
+    private final HookCommandFromApiJsonDeserializer fromApiJsonDeserializer;
+    private final FromJsonHelper fromApiJsonHelper;
 
-	@Autowired
-	public HookWritePlatformServiceJpaRepositoryImpl(
-			final PlatformSecurityContext context,
-			final HookRepository hookRepository,
-			final HookTemplateRepository hookTemplateRepository,
-			final HookCommandFromApiJsonDeserializer fromApiJsonDeserializer,
-			final FromJsonHelper fromApiJsonHelper) {
-		this.context = context;
-		this.hookRepository = hookRepository;
-		this.hookTemplateRepository = hookTemplateRepository;
-		this.fromApiJsonDeserializer = fromApiJsonDeserializer;
-		this.fromApiJsonHelper = fromApiJsonHelper;
-	}
+    @Autowired
+    public HookWritePlatformServiceJpaRepositoryImpl(
+            final PlatformSecurityContext context,
+            final HookRepository hookRepository,
+            final HookTemplateRepository hookTemplateRepository,
+            final TemplateRepository ugdTemplateRepository,
+            final HookCommandFromApiJsonDeserializer fromApiJsonDeserializer,
+            final FromJsonHelper fromApiJsonHelper) {
+        this.context = context;
+        this.hookRepository = hookRepository;
+        this.hookTemplateRepository = hookTemplateRepository;
+        this.ugdTemplateRepository = ugdTemplateRepository;
+        this.fromApiJsonDeserializer = fromApiJsonDeserializer;
+        this.fromApiJsonHelper = fromApiJsonHelper;
+    }
 
-	@Transactional
-	@Override
-	@CacheEvict(value = "hooks", allEntries = true)
-	public CommandProcessingResult createHook(final JsonCommand command) {
+    @Transactional
+    @Override
+    @CacheEvict(value = "hooks", allEntries = true)
+    public CommandProcessingResult createHook(final JsonCommand command) {
 
-		try {
-			this.context.authenticatedUser();
+        try {
+            this.context.authenticatedUser();
 
-			this.fromApiJsonDeserializer.validateForCreate(command.json());
+            this.fromApiJsonDeserializer.validateForCreate(command.json());
 
-			final HookTemplate template = retrieveHookTemplateBy(command
-					.stringValueOfParameterNamed(nameParamName));
-			final String configJson = command.jsonFragment(configParamName);
-			final Set<HookConfiguration> config = assembleConfig(
-					command.mapValueOfParameterNamed(configJson), template);
-			final JsonArray events = command
-					.arrayOfParameterNamed(eventsParamName);
-			final Set<HookResource> allEvents = assembleSetOfEvents(events);
-			final Hook hook = Hook.fromJson(command, template, config,
-					allEvents);
+            final HookTemplate template = retrieveHookTemplateBy(command
+                    .stringValueOfParameterNamed(nameParamName));
+            final String configJson = command.jsonFragment(configParamName);
+            final Set<HookConfiguration> config = assembleConfig(
+                    command.mapValueOfParameterNamed(configJson), template);
+            final JsonArray events = command
+                    .arrayOfParameterNamed(eventsParamName);
+            final Set<HookResource> allEvents = assembleSetOfEvents(events);
+            Template ugdTemplate = null;
+            if (command.hasParameter(templateIdParamName)) {
+                final Long ugdTemplateId = command
+                        .longValueOfParameterNamed(templateIdParamName);
+                ugdTemplate = this.ugdTemplateRepository.findOne(ugdTemplateId);
+                if (ugdTemplate == null) {
+                    throw new TemplateNotFoundException(ugdTemplateId);
+                }
+            }
+            final Hook hook = Hook.fromJson(command, template, config,
+                    allEvents, ugdTemplate);
 
-			validateHookRules(template, config, allEvents);
+            validateHookRules(template, config, allEvents);
 
-			this.hookRepository.save(hook);
+            this.hookRepository.save(hook);
 
-			return new CommandProcessingResultBuilder()
-					.withCommandId(command.commandId())
-					.withEntityId(hook.getId()).build();
-		} catch (final DataIntegrityViolationException dve) {
-			handleHookDataIntegrityIssues(command, dve);
-			return CommandProcessingResult.empty();
-		}
-	}
+            return new CommandProcessingResultBuilder()
+                    .withCommandId(command.commandId())
+                    .withEntityId(hook.getId()).build();
+        } catch (final DataIntegrityViolationException dve) {
+            handleHookDataIntegrityIssues(command, dve);
+            return CommandProcessingResult.empty();
+        }
+    }
 
-	@Transactional
-	@Override
-	@CacheEvict(value = "hooks", allEntries = true)
-	public CommandProcessingResult updateHook(final Long hookId,
-			final JsonCommand command) {
+    @Transactional
+    @Override
+    @CacheEvict(value = "hooks", allEntries = true)
+    public CommandProcessingResult updateHook(final Long hookId,
+            final JsonCommand command) {
 
-		try {
-			this.context.authenticatedUser();
+        try {
+            this.context.authenticatedUser();
 
-			this.fromApiJsonDeserializer.validateForUpdate(command.json());
+            this.fromApiJsonDeserializer.validateForUpdate(command.json());
 
-			final Hook hook = retrieveHookBy(hookId);
-			final HookTemplate template = hook.getHookTemplate();
-			final Map<String, Object> changes = hook.update(command);
+            final Hook hook = retrieveHookBy(hookId);
+            final HookTemplate template = hook.getHookTemplate();
+            final Map<String, Object> changes = hook.update(command);
 
-			if (!changes.isEmpty()) {
+            if (!changes.isEmpty()) {
 
-				if (changes.containsKey(eventsParamName)) {
-					final Set<HookResource> events = assembleSetOfEvents(command
-							.arrayOfParameterNamed(eventsParamName));
-					final boolean updated = hook.updateEvents(events);
-					if (!updated) {
-						changes.remove(eventsParamName);
-					}
-				}
+                if (changes.containsKey(templateIdParamName)) {
+                    final Long ugdTemplateId = command
+                            .longValueOfParameterNamed(templateIdParamName);
+                    final Template ugdTemplate = this.ugdTemplateRepository
+                            .findOne(ugdTemplateId);
+                    if (ugdTemplate == null) {
+                        changes.remove(templateIdParamName);
+                        throw new TemplateNotFoundException(ugdTemplateId);
+                    }
+                    hook.updateUgdTemplate(ugdTemplate);
+                }
 
-				if (changes.containsKey(configParamName)) {
-					final String configJson = command
-							.jsonFragment(configParamName);
-					final Set<HookConfiguration> config = assembleConfig(
-							command.mapValueOfParameterNamed(configJson),
-							template);
-					final boolean updated = hook.updateConfig(config);
-					if (!updated) {
-						changes.remove(configParamName);
-					}
-				}
+                if (changes.containsKey(eventsParamName)) {
+                    final Set<HookResource> events = assembleSetOfEvents(command
+                            .arrayOfParameterNamed(eventsParamName));
+                    final boolean updated = hook.updateEvents(events);
+                    if (!updated) {
+                        changes.remove(eventsParamName);
+                    }
+                }
 
-				this.hookRepository.saveAndFlush(hook);
-			}
+                if (changes.containsKey(configParamName)) {
+                    final String configJson = command
+                            .jsonFragment(configParamName);
+                    final Set<HookConfiguration> config = assembleConfig(
+                            command.mapValueOfParameterNamed(configJson),
+                            template);
+                    final boolean updated = hook.updateConfig(config);
+                    if (!updated) {
+                        changes.remove(configParamName);
+                    }
+                }
 
-			return new CommandProcessingResultBuilder() //
-					.withCommandId(command.commandId()) //
-					.withEntityId(hookId) //
-					.with(changes) //
-					.build();
-		} catch (final DataIntegrityViolationException dve) {
-			handleHookDataIntegrityIssues(command, dve);
-			return null;
-		}
-	}
+                this.hookRepository.saveAndFlush(hook);
+            }
 
-	@Transactional
-	@Override
-	@CacheEvict(value = "hooks", allEntries = true)
-	public CommandProcessingResult deleteHook(final Long hookId) {
+            return new CommandProcessingResultBuilder() //
+                    .withCommandId(command.commandId()) //
+                    .withEntityId(hookId) //
+                    .with(changes) //
+                    .build();
+        } catch (final DataIntegrityViolationException dve) {
+            handleHookDataIntegrityIssues(command, dve);
+            return null;
+        }
+    }
 
-		this.context.authenticatedUser();
+    @Transactional
+    @Override
+    @CacheEvict(value = "hooks", allEntries = true)
+    public CommandProcessingResult deleteHook(final Long hookId) {
 
-		final Hook hook = retrieveHookBy(hookId);
+        this.context.authenticatedUser();
 
-		try {
-			this.hookRepository.delete(hook);
-			this.hookRepository.flush();
-		} catch (final DataIntegrityViolationException e) {
-			throw new PlatformDataIntegrityException(
-					"error.msg.unknown.data.integrity.issue",
-					"Unknown data integrity issue with resource: "
-							+ e.getMostSpecificCause());
-		}
-		return new CommandProcessingResultBuilder().withEntityId(hookId)
-				.build();
-	}
+        final Hook hook = retrieveHookBy(hookId);
 
-	private Hook retrieveHookBy(final Long hookId) {
-		final Hook hook = this.hookRepository.findOne(hookId);
-		if (hook == null) {
-			throw new HookNotFoundException(hookId.toString());
-		}
-		return hook;
-	}
+        try {
+            this.hookRepository.delete(hook);
+            this.hookRepository.flush();
+        } catch (final DataIntegrityViolationException e) {
+            throw new PlatformDataIntegrityException(
+                    "error.msg.unknown.data.integrity.issue",
+                    "Unknown data integrity issue with resource: "
+                            + e.getMostSpecificCause());
+        }
+        return new CommandProcessingResultBuilder().withEntityId(hookId)
+                .build();
+    }
 
-	private HookTemplate retrieveHookTemplateBy(final String templateName) {
-		final HookTemplate template = this.hookTemplateRepository
-				.findOne(templateName);
-		if (template == null) {
-			throw new HookTemplateNotFoundException(templateName);
-		}
-		return template;
-	}
+    private Hook retrieveHookBy(final Long hookId) {
+        final Hook hook = this.hookRepository.findOne(hookId);
+        if (hook == null) {
+            throw new HookNotFoundException(hookId.toString());
+        }
+        return hook;
+    }
 
-	private Set<HookConfiguration> assembleConfig(
-			final Map<String, String> hookConfig, final HookTemplate template) {
+    private HookTemplate retrieveHookTemplateBy(final String templateName) {
+        final HookTemplate template = this.hookTemplateRepository
+                .findOne(templateName);
+        if (template == null) {
+            throw new HookTemplateNotFoundException(templateName);
+        }
+        return template;
+    }
 
-		final Set<HookConfiguration> configuration = new HashSet<>();
-		final Set<Schema> fields = template.getSchema();
+    private Set<HookConfiguration> assembleConfig(
+            final Map<String, String> hookConfig, final HookTemplate template) {
 
-		for (final Entry<String, String> configEntry : hookConfig.entrySet()) {
-			for (final Schema field : fields) {
-				final String fieldName = field.getFieldName();
-				if (fieldName.equalsIgnoreCase(configEntry.getKey())) {
+        final Set<HookConfiguration> configuration = new HashSet<>();
+        final Set<Schema> fields = template.getSchema();
 
-					final HookConfiguration config = HookConfiguration
-							.createNewWithoutHook(field.getFieldType(),
-									configEntry.getKey(),
-									configEntry.getValue());
-					configuration.add(config);
-					break;
-				}
-			}
+        for (final Entry<String, String> configEntry : hookConfig.entrySet()) {
+            for (final Schema field : fields) {
+                final String fieldName = field.getFieldName();
+                if (fieldName.equalsIgnoreCase(configEntry.getKey())) {
 
-		}
+                    final HookConfiguration config = HookConfiguration
+                            .createNewWithoutHook(field.getFieldType(),
+                                    configEntry.getKey(),
+                                    configEntry.getValue());
+                    configuration.add(config);
+                    break;
+                }
+            }
 
-		return configuration;
-	}
+        }
 
-	private Set<HookResource> assembleSetOfEvents(final JsonArray eventsArray) {
+        return configuration;
+    }
 
-		final Set<HookResource> allEvents = new HashSet<>();
+    private Set<HookResource> assembleSetOfEvents(final JsonArray eventsArray) {
 
-		for (int i = 0; i < eventsArray.size(); i++) {
+        final Set<HookResource> allEvents = new HashSet<>();
 
-			final JsonObject eventElement = eventsArray.get(i)
-					.getAsJsonObject();
+        for (int i = 0; i < eventsArray.size(); i++) {
 
-			final String entityName = this.fromApiJsonHelper
-					.extractStringNamed(entityNameParamName, eventElement);
-			final String actionName = this.fromApiJsonHelper
-					.extractStringNamed(actionNameParamName, eventElement);
-			final HookResource event = HookResource.createNewWithoutHook(
-					entityName, actionName);
-			allEvents.add(event);
-		}
+            final JsonObject eventElement = eventsArray.get(i)
+                    .getAsJsonObject();
 
-		return allEvents;
-	}
+            final String entityName = this.fromApiJsonHelper
+                    .extractStringNamed(entityNameParamName, eventElement);
+            final String actionName = this.fromApiJsonHelper
+                    .extractStringNamed(actionNameParamName, eventElement);
+            final HookResource event = HookResource.createNewWithoutHook(
+                    entityName, actionName);
+            allEvents.add(event);
+        }
 
-	private void validateHookRules(final HookTemplate template,
-			final Set<HookConfiguration> config, Set<HookResource> events) {
+        return allEvents;
+    }
 
-		final List<ApiParameterError> dataValidationErrors = new ArrayList<>();
-		final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(
-				dataValidationErrors).resource("hook");
+    private void validateHookRules(final HookTemplate template,
+            final Set<HookConfiguration> config, Set<HookResource> events) {
 
-		if (!template.getName().equalsIgnoreCase(webTemplateName)
-				&& this.hookRepository.findOneByTemplateId(template.getId()) != null) {
-			final String errorMessage = "multiple.non.web.template.hooks.not.supported";
-			baseDataValidator.reset().failWithCodeNoParameterAddedToErrorCode(
-					errorMessage);
-		}
+        final List<ApiParameterError> dataValidationErrors = new ArrayList<>();
+        final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(
+                dataValidationErrors).resource("hook");
 
-		for (final HookConfiguration conf : config) {
-			final String fieldValue = conf.getFieldValue();
-			if (conf.getFieldName().equals(contentTypeName)) {
-				if (!(fieldValue.equalsIgnoreCase("json") || fieldValue
-						.equalsIgnoreCase("form"))) {
-					final String errorMessage = "content.type.must.be.json.or.form";
-					baseDataValidator.reset()
-							.failWithCodeNoParameterAddedToErrorCode(
-									errorMessage);
-				}
-			}
+        if (!template.getName().equalsIgnoreCase(webTemplateName)
+                && this.hookRepository.findOneByTemplateId(template.getId()) != null) {
+            final String errorMessage = "multiple.non.web.template.hooks.not.supported";
+            baseDataValidator.reset().failWithCodeNoParameterAddedToErrorCode(
+                    errorMessage);
+        }
 
-			if (conf.getFieldName().equals(payloadURLName)) {
-				try {
-					final WebHookService service = ProcessorHelper
-							.createWebHookService(fieldValue);
-					service.sendEmptyRequest();
-				} catch (RetrofitError re) {
-					// Swallow error if it's because of method not supported or
-					// if url throws 404 - required for integration test,
-					// url generated on 1st POST request
-					if (re.getResponse() == null) {
-						String errorMessage = "url.invalid";
-						baseDataValidator.reset()
-						.failWithCodeNoParameterAddedToErrorCode(
-								errorMessage);
-					}
-				}
-			}
-		}
+        for (final HookConfiguration conf : config) {
+            final String fieldValue = conf.getFieldValue();
+            if (conf.getFieldName().equals(contentTypeName)) {
+                if (!(fieldValue.equalsIgnoreCase("json") || fieldValue
+                        .equalsIgnoreCase("form"))) {
+                    final String errorMessage = "content.type.must.be.json.or.form";
+                    baseDataValidator.reset()
+                            .failWithCodeNoParameterAddedToErrorCode(
+                                    errorMessage);
+                }
+            }
 
-		if (events == null || events.isEmpty()) {
-			final String errorMessage = "registered.events.cannot.be.empty";
-			baseDataValidator.reset().failWithCodeNoParameterAddedToErrorCode(
-					errorMessage);
-		}
+            if (conf.getFieldName().equals(payloadURLName)) {
+                try {
+                    final WebHookService service = ProcessorHelper
+                            .createWebHookService(fieldValue);
+                    service.sendEmptyRequest();
+                } catch (RetrofitError re) {
+                    // Swallow error if it's because of method not supported or
+                    // if url throws 404 - required for integration test,
+                    // url generated on 1st POST request
+                    if (re.getResponse() == null) {
+                        String errorMessage = "url.invalid";
+                        baseDataValidator.reset()
+                                .failWithCodeNoParameterAddedToErrorCode(
+                                        errorMessage);
+                    }
+                }
+            }
+        }
 
-		final Set<Schema> fields = template.getSchema();
-		for (final Schema field : fields) {
-			if (!field.isOptional()) {
-				boolean found = false;
-				for (final HookConfiguration conf : config) {
-					if (field.getFieldName().equals(conf.getFieldName())) {
-						found = true;
-					}
-				}
-				if (!found) {
-					final String errorMessage = "required.config.field."
-							+ "not.provided";
-					baseDataValidator.reset().value(field.getFieldName())
-							.failWithCodeNoParameterAddedToErrorCode(
-									errorMessage);
-				}
-			}
-		}
+        if (events == null || events.isEmpty()) {
+            final String errorMessage = "registered.events.cannot.be.empty";
+            baseDataValidator.reset().failWithCodeNoParameterAddedToErrorCode(
+                    errorMessage);
+        }
 
-		if (!dataValidationErrors.isEmpty()) {
-			throw new PlatformApiDataValidationException(dataValidationErrors);
-		}
-	}
+        final Set<Schema> fields = template.getSchema();
+        for (final Schema field : fields) {
+            if (!field.isOptional()) {
+                boolean found = false;
+                for (final HookConfiguration conf : config) {
+                    if (field.getFieldName().equals(conf.getFieldName())) {
+                        found = true;
+                    }
+                }
+                if (!found) {
+                    final String errorMessage = "required.config.field."
+                            + "not.provided";
+                    baseDataValidator
+                            .reset()
+                            .value(field.getFieldName())
+                            .failWithCodeNoParameterAddedToErrorCode(
+                                    errorMessage);
+                }
+            }
+        }
 
-	private void handleHookDataIntegrityIssues(final JsonCommand command,
-			final DataIntegrityViolationException dve) {
-		final Throwable realCause = dve.getMostSpecificCause();
-		if (realCause.getMessage().contains("hook_name")) {
-			final String name = command.stringValueOfParameterNamed("name");
-			throw new PlatformDataIntegrityException(
-					"error.msg.hook.duplicate.name", "A hook with name '"
-							+ name + "' already exists", "name", name);
-		}
+        if (!dataValidationErrors.isEmpty()) {
+            throw new PlatformApiDataValidationException(dataValidationErrors);
+        }
+    }
 
-		throw new PlatformDataIntegrityException(
-				"error.msg.unknown.data.integrity.issue",
-				"Unknown data integrity issue with resource: "
-						+ realCause.getMessage());
-	}
+    private void handleHookDataIntegrityIssues(final JsonCommand command,
+            final DataIntegrityViolationException dve) {
+        final Throwable realCause = dve.getMostSpecificCause();
+        if (realCause.getMessage().contains("hook_name")) {
+            final String name = command.stringValueOfParameterNamed("name");
+            throw new PlatformDataIntegrityException(
+                    "error.msg.hook.duplicate.name", "A hook with name '"
+                            + name + "' already exists", "name", name);
+        }
+
+        throw new PlatformDataIntegrityException(
+                "error.msg.unknown.data.integrity.issue",
+                "Unknown data integrity issue with resource: "
+                        + realCause.getMessage());
+    }
 }
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/template/domain/Template.java b/mifosng-provider/src/main/java/org/mifosplatform/template/domain/Template.java
index 46a4ab19b..5fe32480c 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/template/domain/Template.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/template/domain/Template.java
@@ -28,7 +28,7 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 
 @Entity
-@Table(name = "m_template", uniqueConstraints = { @UniqueConstraint(columnNames = { "name" }, name = "unq_name") })
+@Table(name = "m_template", uniqueConstraints = {@UniqueConstraint(columnNames = {"name"}, name = "unq_name")})
 public class Template extends AbstractPersistable<Long> {
 
     @Column(name = "name", nullable = false, unique = true)
@@ -49,7 +49,8 @@ public class Template extends AbstractPersistable<Long> {
     @OneToMany(targetEntity = TemplateMapper.class, cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     private List<TemplateMapper> mappers;
 
-    public Template(final String name, final String text, final TemplateEntity entity, final TemplateType type,
+    public Template(final String name, final String text,
+            final TemplateEntity entity, final TemplateType type,
             final List<TemplateMapper> mappers) {
         this.name = StringUtils.defaultIfEmpty(name, null);
         this.entity = entity;
@@ -65,16 +66,29 @@ public class Template extends AbstractPersistable<Long> {
     public static Template fromJson(final JsonCommand command) {
         final String name = command.stringValueOfParameterNamed("name");
         final String text = command.stringValueOfParameterNamed("text");
-        final TemplateEntity entity = TemplateEntity.values()[command.integerValueSansLocaleOfParameterNamed("entity")];
-        final TemplateType type = TemplateType.values()[command.integerValueSansLocaleOfParameterNamed("type")];
+        final TemplateEntity entity = TemplateEntity.values()[command
+                .integerValueSansLocaleOfParameterNamed("entity")];
+        final int templateTypeId = command
+                .integerValueSansLocaleOfParameterNamed("type");
+        TemplateType type = null;
+        switch (templateTypeId) {
+            case 0 :
+                type = TemplateType.DOCUMENT;
+                break;
+            case 2 :
+                type = TemplateType.SMS;
+                break;
+        }
 
         final JsonArray array = command.arrayOfParameterNamed("mappers");
 
         final List<TemplateMapper> mappersList = new ArrayList<>();
 
         for (final JsonElement element : array) {
-            mappersList.add(new TemplateMapper(element.getAsJsonObject().get("mappersorder").getAsInt(), element.getAsJsonObject()
-                    .get("mapperskey").getAsString(), element.getAsJsonObject().get("mappersvalue").getAsString()));
+            mappersList.add(new TemplateMapper(element.getAsJsonObject()
+                    .get("mappersorder").getAsInt(), element.getAsJsonObject()
+                    .get("mapperskey").getAsString(), element.getAsJsonObject()
+                    .get("mappersvalue").getAsString()));
         }
 
         return new Template(name, text, entity, type, mappersList);
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/template/domain/TemplateType.java b/mifosng-provider/src/main/java/org/mifosplatform/template/domain/TemplateType.java
index db7054723..40dc42d87 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/template/domain/TemplateType.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/template/domain/TemplateType.java
@@ -13,11 +13,11 @@ import com.google.gson.annotations.SerializedName;
 public enum TemplateType {
 
     @SerializedName("Document")
-    DOCUMENT(0, "Document");
+    DOCUMENT(0, "Document"), @SerializedName("SMS")
+    SMS(2, "SMS");
 
     /**
-     * @SerializedName("E-Mail") EMAIL(1, "E-Mail"),
-     * @SerializedName("SMS") SMS(2, "SMS");
+     * @SerializedName("E-Mail") EMAIL(1, "E-Mail")
      */
     private int id;
     private String name;
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/template/service/JpaTemplateDomainService.java b/mifosng-provider/src/main/java/org/mifosplatform/template/service/JpaTemplateDomainService.java
index f6a4801dd..948ce7711 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/template/service/JpaTemplateDomainService.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/template/service/JpaTemplateDomainService.java
@@ -44,7 +44,9 @@ public class JpaTemplateDomainService implements TemplateDomainService {
     @Override
     public Template findOneById(final Long id) {
         final Template template = this.templateRepository.findOne(id);
-        if (template == null) { throw new TemplateNotFoundException(id); }
+        if (template == null) {
+            throw new TemplateNotFoundException(id);
+        }
         return template;
     }
 
@@ -58,12 +60,14 @@ public class JpaTemplateDomainService implements TemplateDomainService {
         final Template template = Template.fromJson(command);
 
         this.templateRepository.saveAndFlush(template);
-        return new CommandProcessingResultBuilder().withEntityId(template.getId()).build();
+        return new CommandProcessingResultBuilder().withEntityId(
+                template.getId()).build();
     }
 
     @Transactional
     @Override
-    public CommandProcessingResult updateTemplate(final Long templateId, final JsonCommand command) {
+    public CommandProcessingResult updateTemplate(final Long templateId,
+            final JsonCommand command) {
         // FIXME - no validation here of the data in the command object, is
         // name, text populated etc
         // FIXME - handle cases where data integrity constraints are fired from
@@ -72,20 +76,36 @@ public class JpaTemplateDomainService implements TemplateDomainService {
         final Template template = findOneById(templateId);
         template.setName(command.stringValueOfParameterNamed(PROPERTY_NAME));
         template.setText(command.stringValueOfParameterNamed(PROPERTY_TEXT));
-        template.setEntity(TemplateEntity.values()[command.integerValueSansLocaleOfParameterNamed(PROPERTY_ENTITY)]);
-        template.setType(TemplateType.values()[command.integerValueSansLocaleOfParameterNamed(PROPERTY_TYPE)]);
+        template.setEntity(TemplateEntity.values()[command
+                .integerValueSansLocaleOfParameterNamed(PROPERTY_ENTITY)]);
+        final int templateTypeId = command
+                .integerValueSansLocaleOfParameterNamed(PROPERTY_TYPE);
+        TemplateType type = null;
+        switch (templateTypeId) {
+            case 0 :
+                type = TemplateType.DOCUMENT;
+                break;
+            case 2 :
+                type = TemplateType.SMS;
+                break;
+        }
+        template.setType(type);
 
         final JsonArray array = command.arrayOfParameterNamed("mappers");
         final List<TemplateMapper> mappersList = new ArrayList<>();
         for (final JsonElement element : array) {
-            mappersList.add(new TemplateMapper(element.getAsJsonObject().get("mappersorder").getAsInt(), element.getAsJsonObject()
-                    .get("mapperskey").getAsString(), element.getAsJsonObject().get("mappersvalue").getAsString()));
+            mappersList.add(new TemplateMapper(element.getAsJsonObject()
+                    .get("mappersorder").getAsInt(), element.getAsJsonObject()
+                    .get("mapperskey").getAsString(), element.getAsJsonObject()
+                    .get("mappersvalue").getAsString()));
         }
         template.setMappers(mappersList);
 
         this.templateRepository.saveAndFlush(template);
 
-        return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(template.getId()).build();
+        return new CommandProcessingResultBuilder()
+                .withCommandId(command.commandId())
+                .withEntityId(template.getId()).build();
     }
 
     @Transactional
@@ -95,7 +115,8 @@ public class JpaTemplateDomainService implements TemplateDomainService {
 
         this.templateRepository.delete(template);
 
-        return new CommandProcessingResultBuilder().withEntityId(templateId).build();
+        return new CommandProcessingResultBuilder().withEntityId(templateId)
+                .build();
     }
 
     @Transactional
@@ -105,7 +126,8 @@ public class JpaTemplateDomainService implements TemplateDomainService {
     }
 
     @Override
-    public List<Template> getAllByEntityAndType(final TemplateEntity entity, final TemplateType type) {
+    public List<Template> getAllByEntityAndType(final TemplateEntity entity,
+            final TemplateType type) {
 
         return this.templateRepository.findByEntityAndType(entity, type);
     }
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/template/service/TemplateMergeService.java b/mifosng-provider/src/main/java/org/mifosplatform/template/service/TemplateMergeService.java
index fcc549885..d3611219f 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/template/service/TemplateMergeService.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/template/service/TemplateMergeService.java
@@ -23,6 +23,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.codehaus.jackson.map.ObjectMapper;
+import org.mifosplatform.infrastructure.core.service.ThreadLocalContextUtil;
 import org.mifosplatform.template.domain.Template;
 import org.mifosplatform.template.domain.TemplateFunctions;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -35,23 +36,32 @@ import com.github.mustachejava.MustacheFactory;
 @Service
 public class TemplateMergeService {
 
-//    private final FromJsonHelper fromApiJsonHelper;
+    // private final FromJsonHelper fromApiJsonHelper;
     private Map<String, Object> scopes;
+    private String authToken;
 
-//    @Autowired
-//    public TemplateMergeService(final FromJsonHelper fromApiJsonHelper) {
-//        this.fromApiJsonHelper = fromApiJsonHelper;
-//    }
+    // @Autowired
+    // public TemplateMergeService(final FromJsonHelper fromApiJsonHelper) {
+    // this.fromApiJsonHelper = fromApiJsonHelper;
+    // }
 
-    public String compile(final Template template, final Map<String, Object> scopes) throws MalformedURLException, IOException {
+    public void setAuthToken(final String authToken) {
+        this.authToken = authToken;
+    }
+
+    public String compile(final Template template,
+            final Map<String, Object> scopes) throws MalformedURLException,
+            IOException {
 
         this.scopes = scopes;
         this.scopes.put("static", new TemplateFunctions());
 
         final MustacheFactory mf = new DefaultMustacheFactory();
-        final Mustache mustache = mf.compile(new StringReader(template.getText()), template.getName());
+        final Mustache mustache = mf.compile(
+                new StringReader(template.getText()), template.getName());
 
-        final Map<String, Object> mappers = getCompiledMapFromMappers(template.getMappersAsMap());
+        final Map<String, Object> mappers = getCompiledMapFromMappers(template
+                .getMappersAsMap());
         this.scopes.putAll(mappers);
 
         final StringWriter stringWriter = new StringWriter();
@@ -60,14 +70,16 @@ public class TemplateMergeService {
         return stringWriter.toString();
     }
 
-    private Map<String, Object> getCompiledMapFromMappers(final Map<String, String> data) {
+    private Map<String, Object> getCompiledMapFromMappers(
+            final Map<String, String> data) {
 
         final MustacheFactory mf = new DefaultMustacheFactory();
 
         if (data != null) {
             for (final Map.Entry<String, String> entry : data.entrySet()) {
 
-                final Mustache mappersMustache = mf.compile(new StringReader(entry.getValue()), "");
+                final Mustache mappersMustache = mf.compile(new StringReader(
+                        entry.getValue()), "");
                 final StringWriter stringWriter = new StringWriter();
 
                 mappersMustache.execute(stringWriter, this.scopes);
@@ -88,11 +100,13 @@ public class TemplateMergeService {
     }
 
     @SuppressWarnings("unchecked")
-    private Map<String, Object> getMapFromUrl(final String url) throws MalformedURLException, IOException {
+    private Map<String, Object> getMapFromUrl(final String url)
+            throws MalformedURLException, IOException {
 
         final HttpURLConnection connection = getConnection(url);
 
-        final String response = getStringFromInputStream(connection.getInputStream());
+        final String response = getStringFromInputStream(connection
+                .getInputStream());
         HashMap<String, Object> result = new HashMap<>();
         if (connection.getContentType().equals("text/plain")) {
             result.put("src", response);
@@ -104,20 +118,29 @@ public class TemplateMergeService {
 
     private HttpURLConnection getConnection(final String url) {
 
-        final String name = SecurityContextHolder.getContext().getAuthentication().getName();
-        final String password = SecurityContextHolder.getContext().getAuthentication().getCredentials().toString();
+        if (this.authToken == null) {
+            final String name = SecurityContextHolder.getContext()
+                    .getAuthentication().getName();
+            final String password = SecurityContextHolder.getContext()
+                    .getAuthentication().getCredentials().toString();
 
-        Authenticator.setDefault(new Authenticator() {
+            Authenticator.setDefault(new Authenticator() {
 
-            @Override
-            protected PasswordAuthentication getPasswordAuthentication() {
-                return new PasswordAuthentication(name, password.toCharArray());
-            }
-        });
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(name, password
+                            .toCharArray());
+                }
+            });
+        }
 
         HttpURLConnection connection = null;
         try {
             connection = (HttpURLConnection) new URL(url).openConnection();
+            if (this.authToken != null) {
+                connection.setRequestProperty("Authorization", "Basic "
+                        + this.authToken);
+            }
             TrustModifier.relaxHostChecking(connection);
 
             connection.setDoInput(true);
diff --git a/mifosng-provider/src/main/resources/sql/migrations/core_db/V230__add_ugd_template_id_m_hook.sql b/mifosng-provider/src/main/resources/sql/migrations/core_db/V230__add_ugd_template_id_m_hook.sql
new file mode 100644
index 000000000..1e63bdd13
--- /dev/null
+++ b/mifosng-provider/src/main/resources/sql/migrations/core_db/V230__add_ugd_template_id_m_hook.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `m_hook` ADD COLUMN `ugd_template_id` bigint(20) NOT NULL;
+ALTER TABLE `m_hook` ADD CONSTRAINT `fk_ugd_template_id` FOREIGN KEY (`ugd_template_id`) REFERENCES `m_template` (`id`);
\ No newline at end of file