commit for MIFOSX-1638 (Waiving charges attached to zero balance instalments - Loan Rescheduling)
Merge branch 'MIFOSX-1638' of git://github.com/emmanuelnnaa/mifosx into emmanuelnnaa-MIFOSX-1638

Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java
Merge branch 'emmanuelnnaa-MIFOSX-1638' into develop