NF: group order by user
Merge branch 'master' into develop

* master:
  BF: Forgot to change field name in template to description
  NF: Placeholder forms for emailing, functionality not ready yet
NF: Added by-user tab, and general tab functionality
NF: Added totals row