partially completes tour editing
completes download-images
small changes
completed tour images downloading
conflicts resolved
Merge branch 'download-images'