remove shipment.finalize call.  silly mistake, this should only be called on checkout, not shipping
support for setting backorder, avoid zero stock moves
fix crash when released version of ROP talks to backorder-enabled spree_retailops
Merge branch 'master' of git://github.com/dotandbo/spree_retailops
attempt to support conversion of variants between master and non-master
first crack at synchronize/order writeback
Price writeback, RMA writeback, generate actual RMA returns on ROP return
attempt to generate rails log entries for caught exceptions
Pull shipment-cost-munger out into a separate object so that it can be used from writeback
Accept order shipping amounts written back from ROP
Discrepancy adjustments, etc
sanity check for intra-family sku conflict
tweaks to get discrepancy adjustments fully working
tweaks to get shipping amounts working
Discount adjustment needs to be negative
Fix logging. "logger" is inexplicably nil inside Spree controllers (rails version issue?)
Fix tracking
Document new hooks
Fix typo causing failures in order sync