fixes #5248 correct how adv search opts are updates
minor typo in activity sample data
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev
Merge branch 'dev' into test