include order status in edit group_order (completes 8fd384b769db64888dae491dbf42632dbd42ae74)
Merge branch 'uicleanup' into foodcoop-adam-new

Conflicts:
	app/views/group_orders/show.html.haml