Add new images and categories

Merged Drane, Lance requested to merge grw_17 into dev

Merge request reports