better management of the import wizard
deleted useless comments
Merge remote-tracking branch 'origin/master'