added order total
Merge branch 'master' into order_total_price