edit order user-interface update
Merge branch 'feature-orders_ui' into foodcoop-adam-beta

Conflicts:
	app/models/order.rb