Lessen events window #2665

This commit is a revert of #2665. The original task
was to include all events during a training. This commit
brings the window of upcoming events back into a more
useful date range for most activities.

Plus these values are defaults and can be updated in most
searches through the UI.
Sort contacts #3141

Contacts on the participant contact history tab were
potentially not sorted in any order. This commit ensures
that the contacts shown are displayed in chronological
order

Closes #3141
Updated incorrect link #3140

Fixes #3140
Merge branch 'master' of https://github.com/NUBIC/ncs_navigator_core
Remove patch #3113

Current surveyor version 1.2 includes this patch and addresses
subsequent issues. Removing this patch.