Merge branch 'master' into marty
Fucked up commit
Revert "Fucked up commit"

This reverts commit 222a890aa2cdcc346b6b5956de0c0fc33529623d.
added code back in to show product images
Merge branch 'marty'