new counting and pagination, fixes #7147
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev