more refactoring and specs for data-import phase2
Merge branch 'master' of https://github.com/steveoro/goggles
merged commit; new vers. 4.00.547