Order flow new product

Merged H's branch (order_flow) and W's branch (new_product) together locally, then pushed to remote branch.  Now can merge to master.