add timeout when loading second image for firefox responsiveness
add button for image import
Merge branch 'image-upload' into develop