mifosx-317

re pull request