[AI-478] - Filter by Location in Pivot Table
Merge branch 'version3' of https://github.com/bedatadriven/activityinfo.git into version3