Backend fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/items/item_created.js.erb