fix
Merge remote-tracking branch 'refs/remotes/origin/master' into new_order

Conflicts:
	app/assets/javascripts/order.js
	config/application.rb
orders create
Merge pull request #4 from Bedunkevich/new_order

New order