Admin can contro items
Merge branch 'items_admin'

Conflicts:
	config/routes.rb