DataImporter refactoring, part 1
Merge branch 'master' of https://github.com/steveoro/goggles