audit of image sizes used in templates
Merge remote-tracking branch 'origin/master'