Refactor of cart to add merging, always create carts + checkout UI updates
Merge branch 'master' of github.com:ongoworks/reaction