Feature/cart quantity

merge together with cart branch feature/cart-quantity