latest changes from Mifosx code-base

Just to be in sync with mifosx repo