loading images + tool dialog changes
Merge branch 'master' into save-feature
removed an unused import