edit item and garment admin show views
Merge remote-tracking branch 'origin/master'