Merge branch 'master' into marty
finished product category displays
Merge branch 'marty'