Pulled and merged some improvements from develop in 0bb68febec and added translations/locale to the cart/bag