Merge pull request #301 from lrozanski/master

Fixed test for MIFOS-5995: Error with Data Import
MIFOS-6016: Fixed master test server not working