change subtotal to description
Merge remote-tracking branch 'GitHub/master' into orderpages
Merge branch 'orderpages'