Merge branch 'master' into marty
finished product category displays
Merge branch 'marty'
Merge branch 'Adam-Jones'
Merge branch 'master' into Adam-Jones