fixes #6723 pagecount
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev