Add child order items
Merge remote-tracking branch 'origin/develop' into childoi
Merge branch 'develop' into childoi
Push all merge/persist/delete calls to the PriceOrderIfNecessaryActivity
Merge branch 'develop' into childoi
Slight fix for dependent order items when added together
Add comment
Maintain backwards compatibility with previous method
Merge remote-tracking branch 'origin/develop' into childoi
Remove requirement that parent order items must belong in the same order
Ensure the state of the order returned from addItem() is correct
Merge branch 'develop' into childoi
Ensure BundleOrderItems are accounted for in the pricing activity