Add item page and link to item from items page
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/items_controller.rb
	app/views/items/_item.html.erb
	app/views/items/show.html.erb