FEATURE 2015.3, 2015.4, 2015.5 - A new email merge code, ##SHIPMENTSHIPPINGMETHOD##, has been added

A new email merge code, ##SHIPMENTSHIPPINGMETHOD##, has been added to pull the shipping method stored on the shipment. If a shipment record isn't found it defaults to the value of ##SHIPPINGMETHOD##.