fix bug related to cart misplacing itself if you scroll down far and click a button
Merge remote-tracking branch 'origin/master'