Merge Aggregate receipts feature

KarinGrequested to merge
aggregate_receipts into master

Created by: lolaslade

Tested by Karin in Truckee (sunny but cold)

Merge request reports