Initiating Fixes
Merge branch 'master' of https://github.com/ishan1604/MifosXDroid