fix issue for empty items
Merge branch 'develop' of github.com:TigerWolf/shaprgram into develop

Conflicts:
	app/views/items/_list.html.erb