Feature/latest 2 3 stable

Integrate the latest version of Spree 2.3 into our 2-3-dev.