#73589 Prices before Billing do not reflect Subsidy
Merge branch 'master' into upgrades

Conflicts:
	app/views/facility_reservations/index.html.haml
	app/views/order_search/index.html.haml
	app/views/shared/_reservations_table.html.haml