Move JS file into separate folder.
Issue #1842640 by googletorp, sergiu.savva: Fix loading checkout pane in commerce_shipping_recalculate_services.
Fix options callback for shipping service field.
Clean up white space.
Issue #1843402 by Fonant, makangus: ensure the update process from Shipping 1.x won't fail if a line item somehow references a deleted order.
Don't hard-code currency in example module.
Issue #2018157 by rszrama: ensure commerce_shipping_line_item_title() can't return an array of shipping service titles if a line item's shipping service field isn't set for some reason.
Issue #2010738 by _theo: Add shipping service description to shipping selection form
Issue #1992734 by barraponto, Byfred: Customized display_title for shipping services
Issue #2026321 by plach: Avoid overwriting an already updated order
Issue #1952640 by Anthony Goode, googletorp: Machine name label of Admin config shipping interface not translatable
Merge tag '7.x-2.1' of git://drupalcode.org/project/commerce_shipping