changes for mifosx-1634
Merge branch 'MIFOSX-1634' into develop