Fixed image renaming feature, which could lead to duplicated file names if using gallery#550

crysix wants to merge 3 commits intodweeves:masterdweeves/magmi-git:masterfrom

crysix:mastercrysix/magmi-git:masterCopy head branch name to clipboard