added DownloadImagesTask
fixed merge conflict