refs #6608 associated fix to dev
fixes #6635 improve contact quicksearch query via hook
refs #6605 make sure country default is set when using prox search
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev