Merge items and cart items for cart overview page
Merge branch 'master' of https://github.com/msandrock/buddyshopping