Reinstate delivery step so end user address is available
Update spree to get rid of shipping calculation error
Merge branch 'staging'