Fixed cart contents
Merge branch '1.2/develop' of https://github.com/firesale/FireSale into 1.2/develop