Fix cart for mobile
Merge branch 'develop'