update items
fix deletion
update items
update items
update items
Merge branch 'master' into heroku-master

Conflicts:
	server/item.js