Slight changes to image viewer. Lazy loading of images works a little better. Still needs more testing.
Merge remote-tracking branch 'origin/master'