Wire up js to controller
Merge branch 'caple8'

Conflicts:
	app/controllers/orders_controller.rb
	app/models/order.rb