MIFOS-5753: Minor fix
Fixed MIFOS-5995: Error with Data Import
Merge pull request #304 from lrozanski/master

Fixed MIFOS-5995: Error with Data Import
MIFOS-5992: Improve Mifos view - add possibility to upload logo to Mifos