more refactoring on data-import phase2 (and a little of phase3)
Merge branch 'master' of https://github.com/steveoro/goggles