Merging master to live.  There are a huge number of changes to images

Basically we have not optimised any PNG's in a long time and some folders are also missed.  This fix on staging has been tested.