Merge pull request #1039 from pramodn02/develop

MIFOSX-1421 : loan recalculation changes
MIFOSX-1421 : corrected loan charges