xxx
 delete_order_item.js.erb needs to update Order
xxx
Merge branch 'debian_4_0_1_12' into new_item_locations

Conflicts:
	salor-retail/app/views/orders/delete_order_item.js.erb
Finished unpaid orders