Merge branch 'peteschaffner-update/icons'.

Add retina icons.