items.show feature
Merged master into items.show
debugged