Delivery charge calculated based on location selection. Uses JS to choose/edit location
Merge branch 'edit_delivery'

Conflicts:
	app/models/order.rb