added ability to see images on the index page for any items which have images
Fixed merge conflicts
Merge branch 'order-entry' of https://github.com/shipstation/gitdemo into order-entry