Updates to the items/show page
Merge remote-tracking branch 'origin/master'

Conflicts:
	items/show.php