Working on order total overviews
Merge remote-tracking branch 'origin/master'