Users can order bulk and personal items
Merge branch 'form_submit'

Conflicts:
	app/controllers/order_items_controller.rb
	app/views/order_items/index.html.erb
	app/views/order_items/new.html.erb
	config/routes.rb
	db/seeds.rb
	spec/features/user_orders_personal_item_spec.rb