Part 2 of subject problem, fixes #7072
Part 3 of subject problem, fixes #7072
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev

* 'dev' of github.com:nysenate/Bluebird-CRM:
  fixes #7054 activity report target query
  Added log option for updateAddresses2.php
  fixes #7062 page not found
  minor cleanup, activity report