Changing activity type, refs #5550
Changing activity type search, fixes #5550
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev