Merge branch 'loanConfig' of https://github.com/chandrikamohith/mifosx into chandrikamohith-loanConfig

Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProduct.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java

api-docs/apiLive.htm

@@ -11676,6 +11676,12 @@ An enumeration that indicates the type of transaction processing strategy to be
 						<tr>
 							<td class=fielddesc>If Specified as true, arrears will be identified based on original schedule.<br>
 						</tr>
+						<tr class=alt>
+							<td>allowAttributeOverrides</td>
+						</tr>
+						<tr>
+							<td class=fielddesc>Specifies if select attributes may be overridden for individual loan accounts.<br>
+						</tr>
 					</table>
 				</div>
 			</div>
@@ -12942,7 +12948,7 @@ GET https://DomainName/api/v1/loanproducts/{productId}
 							numberOfRepaymentVariationsForBorrowerCycle,
 							interestRateVariationsForBorrowerCycle,
 							multiDisburseLoan,maxTrancheCount,
-							outstandingLoanBalance,overdueDaysForNPA,holdGuaranteeFunds, principalThresholdForLastInstalment, accountMovesOutOfNPAOnlyOnArrearsCompletion, canDefineInstallmentAmount, installmentAmountInMultiplesOf
+							outstandingLoanBalance,overdueDaysForNPA,holdGuaranteeFunds, principalThresholdForLastInstalment, accountMovesOutOfNPAOnlyOnArrearsCompletion, canDefineInstallmentAmount, installmentAmountInMultiplesOf, allowAttributeOverrides
 							</td>
 						</tr>
 					</table>
@@ -13045,6 +13051,16 @@ Request Body:
 		"maxValue":"20"
 	}
 ],
+"allowAttributeOverrides":
+	{amortizationType : true,	
+	 interestType : true,
+	 transactionProcessingStrategyId : false,
+	 interestCalculationPeriodType : true,
+	 inArrearsTolerance : false,
+	 repaymentEvery : true,
+	 graceOnPrincipalAndInterestPayment : true,
+	 graceOnArrearsAgeing : true},
+	 
 "accountingRule":"2",
 "name":"product 5",
 "shortName":"prd5",