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
MIFOS-5983: Possibility to sort fields during new Client creation
Fixed tests: MIFOS-5985: Improve user's security
Localisation updates from http://translatewiki.net.