deleted a whole bunch of images
Merge branch 'dev'