Merge pull request #293 from lrozanski/master

Fixed MIFOS-5995: Error with Data Import
Fixed acceptance test for MIFOS-5995: Error with Data Import
Merge remote-tracking branch 'upstream/master'