mifosx-364
Merge remote-tracking branch 'soc_yanna/MIFOSX-364' into mifosplatform-1.1.2
Merge branch 'master' into develop