Item view (alternatives)
Merge branch 'item_view_hot' into dev

Conflicts:
	app/models/item.rb
	app/views/items/_form.html.erb
After fixtures