Fix bad merge
Merge branch 'master' into bpa-test-locations
Scopes for test locations
More descriptive label
Center align
Include footer row with totals
Include test locations in photo processing