Consider shipping method from cookie in cart data provider if present.
Merge branch 'master' of git://github.com/bluedynamics/bda.plone.shop