#520: commented out re-upload button in image editor.
Merge branch 'dev-1.4.5'