fix activity report when filtering on contact name or current user
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev
Merge branch 'dev' into test
Merge branch 'test' into prod