1.5.0.rc3
Merge branch 'master' of https://github.com/NUBIC/ncs_navigator_core
Survey root did not use survey_identifier #3780

And thus did not correctly choose the activity associated with
the survey having been taken.

Closes #3780
Re-order activities #3786

Activities for 6-month event were ordered improperly.
This commit re-orders the activities.

Closes #3786
1.5.0.rc4