Removed OrderAdjustment entity and extended OrderItem to be hierarchical and have fields special to adjustments for taxes; adjusted related services as well
Merge remote-tracking branch 'upstream/master'