Fixed bug where shopping cart total lagged behind subtotal
Merge branch 'feature-ajax-fresh' into custom-aplus2