Merge pull request #294 from lrozanski/master

Fixed MIFOS-5995: Error with Data Import
Fixed MIFOS-6003: Mifos doesn't accept datawarehouse db that contains numbers in db name